tree d35fbfc276b6ddb360be2c169549d480c12c7d14
parent e8b585e18b4308e0d79327c5e9db546d7c37902e
parent 62aec19b717d169fbce74a87a24af90fa8391681
author Dan Willemsen <dwillemsen@google.com> 1463088053 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1463088053 +0000

Merge "Android.bp: Update to match make builds"