tree 00f33ed195465a2a480d0e6d5c2cf217522ff6d9
parent 5544a6b685862c23400fc4d0298801f8c3750fff
parent 4b6275848c4fbbb4b6e0be009a04ffd3dea9a96d
author Dan Willemsen <dwillemsen@google.com> 1472660249 +0000
committer android-build-merger <android-build-merger@google.com> 1472660249 +0000

Merge "Simplify Soong bootstrapping" am: 2e5dc07c1f am: 67dc1c2e4c
am: 4b6275848c

Change-Id: Iaf5ea3e651e025701a8cedf091c18d4130f97947