tree 80425f8ecf7469eb04bd5cf1edb8c978a332b1da
parent ad220f455215ab8730597d95c5317aa5f7f9f463
parent b15b1d8eac0c3c9fd82496ab9944254317f72be8
author Jonathan Solnit <jsolnit@google.com> 1501523059 +0000
committer android-build-merger <android-build-merger@google.com> 1501523059 +0000

Merge "marlin: update kernel prebuilt[ DO NOT MERGE ANYWHERE ]" into oc-dev
am: b15b1d8eac  -s ours

Change-Id: I78b3de11f981e7fb60af54cf3aef6ececfc366de