tree f2bdc53f746f3a70faef6419305c9488ff21bc95
parent f40b3da46b245ab5d92f2a0e4057392315e0ff00
parent 42cffe3e8be7612a1c30f5ad5bed0db1e91ffabc
author Ed Tam <etam@google.com> 1436749763 +0000
committer android-build-merger <android-build-merger@google.com> 1436749763 +0000

flo: update prebuilt kernel automerge: 155ffef
automerge: 42cffe3

* commit '42cffe3e8be7612a1c30f5ad5bed0db1e91ffabc':
  flo: update prebuilt kernel