tree 43b53f0391b58423fec5e8e056f5a65d1f01070f
parent f409ca2ece364591d527520e649a0dd10e9419c6
parent 152a93e7ebb4034392b6748fcedb47ca197e1e98
author Mark Salyzyn <salyzyn@google.com> 1475800658 +0000
committer android-build-merger <android-build-merger@google.com> 1475800658 +0000

Merge "flounder: update prebuilt kernel" into nyc-mr1-dev am: 3b67c0086e
am: 152a93e7eb

Change-Id: Icac25f498e6320ea4df53593a3bc68d6b515978b