tree e0e4b6e72586a8f375bce078cc8d8a93ff69a901
parent 9548c7fdeb6b573f714422c521740928eb3ee04d
parent acb4e8e6bddce21bdce2e7617733d78e78d79d13
author Android Build Merger (Role) <android-build-merger@google.com> 1497048877 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1497048878 +0000

Merge "fugu: update kernel prebuilt[ DO NOT MERGE ] am: d7815f2006  -s ours am: 7e91f90de0 am: 54590a2994" into oc-dr1-dev-plus-aosp