tree bf8c4950da5079e07a94d5c0ccd17ca17694de3b
parent ead82c22febb4fd84a27ff4713a049808b75ea60
parent 3425268fd566a2cf5613bff4e515ea99f07314b5
author Dan Willemsen <dwillemsen@google.com> 1458773360 +0000
committer android-build-merger <android-build-merger@google.com> 1458773360 +0000

Merge "Replace custom rules with BUILD_PREBUILT"
am: 3425268

* commit '3425268fd566a2cf5613bff4e515ea99f07314b5':
  Replace custom rules with BUILD_PREBUILT