tree e813271f2f5e35dbe13145978c403e441f09ca9f
parent 62b813e4c9b8e334c3b190713152f90655470f93
parent d044137cbe2b80f3cb9b3c570fb7445377128d81
author Colin Cross <ccross@android.com> 1468340431 +0000
committer android-build-merger <android-build-merger@google.com> 1468340431 +0000

Merge \"Rename Android.soong.mk to Android.mk\"
am: d044137cbe

Change-Id: I4f97ae2f54cd271f3a9acbb16649a41b62d342c4