tree ab8cbcc917d27a14835423e3eec45ef35fe723b9
parent 19ba6f1b0bf1f684cb7ae4e283390ce58e3b0ed9
parent 6eb7c74188e27b5d271b22e4f776cba854c8a06e
author Ed Tam <etam@google.com> 1447370430 +0000
committer android-build-merger <android-build-merger@google.com> 1447370430 +0000

resolve merge conflicts of c45b2cc525 to lmp-mr1-app-dev. am: 610cf316a8 am: 542b135203  -s ours am: a40e99046b
am: 6eb7c74188

* commit '6eb7c74188e27b5d271b22e4f776cba854c8a06e':
  flo: update prebuilt kernel [DO NOT MERGE]