tree e633fbf662ebac396360a6d2ee4ea80d5c000937
parent 75a52d2bdfb025347f4c3c8239a187b00ac3cbd2
parent d9174bf856b38870c702d41a4fdb83289ffe6e39
author Patrick Tjin <pattjin@google.com> 1436116327 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436116327 +0000

am d9174bf8: (-s ours) flo: update prebuilt kernel automerge: a200888 automerge: dc22f95

* commit 'd9174bf856b38870c702d41a4fdb83289ffe6e39':
  flo: update prebuilt kernel