tree f623ac873afcc317832e3c7e4015d5c927183e92
parent 0e56fa56392f99b95f15251c98898b52f1e6286a
parent b133acfd0ecd67bb499cd22710be355c34e6562c
author Colin Cross <ccross@android.com> 1415737896 +0000
committer android-build-merger <android-build-merger@google.com> 1415737896 +0000

am 344d9873: (-s ours) flounder: update prebuilt kernel
automerge: b133acf

* commit 'b133acfd0ecd67bb499cd22710be355c34e6562c':