tree f4339400ae765f628c1d32abd4ffc9943f11591f
parent 64ac4368c6a3b960fa09fc629d4306f099c06de7
parent f9afd3b6cb33b3f83350db3f651acafd84550720
author Dan Willemsen <dwillemsen@google.com> 1479952457 +0000
committer android-build-merger <android-build-merger@google.com> 1479952457 +0000

Merge "Replace custom rules with BUILD_PREBUILT" am: 5892520
am: f9afd3b6cb  -s ours

Change-Id: I20226ef2c2bc51fb1334547db1ba813a84ac8c63