tree 51171322c442d067025a0af27ac3a871745b9561
parent b595a8ba1b0cb9bcc8a534e2a650c450ba25a431
parent f6dee03e9e56ea5a85d6be24b118d625841e189f
author Stuart Scott <stuartscott@google.com> 1497285728 +0000
committer android-build-merger <android-build-merger@google.com> 1497285728 +0000

Merge "fugu: update kernel prebuilt" into oc-dev am: 4e4ce0ca88 am: 7c3327c8df
am: f6dee03e9e

Change-Id: I55ebca89ed0ed04e5fc588c9713b6fdc707c71ae