tree ab8cbcc917d27a14835423e3eec45ef35fe723b9
parent 0cdb9c18fe386d2426407e884aea90e6747d9e40
parent ba85a48271c8a5fd6d43653dffe153a40a100125
author Ed Tam <etam@google.com> 1447370591 +0000
committer android-build-merger <android-build-merger@google.com> 1447370591 +0000

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

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