tree 75e730dea14c133edcd21914f74ff50f040ca107
parent ad6767b939facf79986dbad34ff293f3e2a7aa24
parent 91ee9232ac4dfa012c1c71e35556141485cabdce
author Badhri Jagan Sridharan <badhri@google.com> 1497977561 +0000
committer android-build-merger <android-build-merger@google.com> 1497977561 +0000

Merge "marlin: update kernel prebuilt" into oc-dev
am: 91ee9232ac

Change-Id: I0b7598f76cf8f98e6cf8ef614c750dd5b0c67922