tree e813271f2f5e35dbe13145978c403e441f09ca9f
parent 0af8833b8f653b5a72821e86e3d9e3a469450ae1
parent 375be57f1600a35c605b6cbf82c9e0c4a8808ee9
author Colin Cross <ccross@android.com> 1468341115 +0000
committer android-build-merger <android-build-merger@google.com> 1468341115 +0000

Merge \\\"Rename Android.soong.mk to Android.mk\\\" am: d044137cbe am: 17dda56f12
am: 375be57f16

Change-Id: I96a5f86e7b7b475b631ce99d84fc0bc74a9de9dc