tree e633fbf662ebac396360a6d2ee4ea80d5c000937
parent 75fcc7d1227b9dc1255d4be058d5982fb5e585cb
parent a99b2e42151dd05a53400532966a07ecc097b7a8
author Ed Tam <etam@google.com> 1436116302 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436116302 +0000

am a99b2e42: (-s ours) am d0ae1b98: (-s ours) flo: update prebuilt kernel - DO NOT MERGE automerge: 6d74123  -s ours

* commit 'a99b2e42151dd05a53400532966a07ecc097b7a8':