tree fbeb47edbc441a18cf193e0ada16bfd01f41591d
parent 8ce0be3353d39d8dd540e1bfdacb88b612bc361f
parent 58925207ee0e8fc4a4ebd37743678362188908c1
author Dan Willemsen <dwillemsen@google.com> 1458766114 +0000
committer android-build-merger <android-build-merger@google.com> 1458766114 +0000

Merge "Replace custom rules with BUILD_PREBUILT"
am: 5892520

* commit '58925207ee0e8fc4a4ebd37743678362188908c1':
  Replace custom rules with BUILD_PREBUILT