tree fdd95af92779676d74c0b20470568c1c5b3fba34
parent 927b6a420fe8929464290ca72283c96ffab88c53
parent 594cf7c4f9742ca584258591646d8dc3cf4d7db9
author Dan Willemsen <dwillemsen@google.com> 1479952738 +0000
committer android-build-merger <android-build-merger@google.com> 1479952738 +0000

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

Change-Id: I9abe9a9c0c5cca6bd625222f81b2c02aef576ec7