tree d35fbfc276b6ddb360be2c169549d480c12c7d14
parent 085122d762c2ac96fde059e88ebd0b070b671088
parent 273b50e4e57b2c3ce1c334f8ffda71cbc94e26e7
author Dan Willemsen <dwillemsen@google.com> 1463088496 +0000
committer android-build-merger <android-build-merger@google.com> 1463088496 +0000

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

* commit '273b50e4e57b2c3ce1c334f8ffda71cbc94e26e7':
  Android.bp: Update to match make builds

Change-Id: Iebcdade7b12ff7f58fc82fe84c5bbbd3514dac8f