tree 1b2e18cb1d48bb09a8bf658e22d4135808fb10bb
parent ddd4fa2b567cbb451b03b51863e79a25c56c99e9
parent b37cabbfef152a1a429f0904522dcd789b66ba46
author Tom Cherry <tomcherry@google.com> 1495506544 +0000
committer android-build-merger <android-build-merger@google.com> 1495506544 +0000

Merge "init: start move to Android.bp" am: 276f765984 am: 062657cf2b
am: b37cabbfef

Change-Id: Id1960b4bfb537719e52023edc4c3f808d47996ab