tree 5bfb16a733ecc63f1e0ce254fe55a0926111ee0f
parent 003a1bcf7d2a8ac8680f8c41ca73e526045c6229
parent 6a6163d0230036d4fcafcae6dddbb774d422961f
author Colin Cross <ccross@android.com> 1493918271 +0000
committer android-build-merger <android-build-merger@google.com> 1493918271 +0000

Merge "Convert libhwui to Android.bp" into oc-dev-plus-aosp
am: 6a6163d023  -s ours

Change-Id: Ifaf273ae3841d516fa6b644d7893977334dabf49