OSDN Git Service

Merge \\\\"Rename Android.soong.mk to Android.mk\\\\" am: 7fd1e75e24 am: 769f3a9153...
authorColin Cross <ccross@android.com>
Tue, 12 Jul 2016 16:44:31 +0000 (16:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Jul 2016 16:44:31 +0000 (16:44 +0000)
am: 4076f98c2d

Change-Id: Iefdaa1ef53f022bd0283d6ee1488ba4571c898a3


Trivial merge