tree f4339400ae765f628c1d32abd4ffc9943f11591f
parent 8267b109552460025be1ec3f004e45dfb467ce4b
parent 2ba318792f1632d181f61003263c5293fafbffd4
author Dan Willemsen <dwillemsen@google.com> 1479952578 +0000
committer android-build-merger <android-build-merger@google.com> 1479952578 +0000

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

Change-Id: Ia26bc77da7181bf0a9b3a7706a5a3cf1f174458d