tree d35fbfc276b6ddb360be2c169549d480c12c7d14
parent 3dc7ce4944067278ac85b1ca68ec8592e59823d8
parent 030085f53df7d74b861b12de792596406ff667f3
author Dan Willemsen <dwillemsen@google.com> 1463088357 +0000
committer android-build-merger <android-build-merger@google.com> 1463088357 +0000

Merge "Android.bp: Update to match make builds"
am: 030085f53d

* commit '030085f53df7d74b861b12de792596406ff667f3':
  Android.bp: Update to match make builds

Change-Id: I9cb883c5bdea61d3b2c4d9d1800a7c2cb6cf66e4