OSDN Git Service

[automerger skipped] Merge "Convert Settings to Android.bp" am: 06dfd75660 am: 8ddf9e...
authorColin Cross <ccross@android.com>
Thu, 30 May 2019 22:23:14 +0000 (15:23 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 May 2019 22:23:14 +0000 (15:23 -0700)
commitab93f00e116781b4cbde13dfdb1702d20fbe4c6b
treea1d148611e22617ca8774508ec5faf5017c19d50
parent37344f57b36a4d1dbd095a1dde7932f43ce85f86
parent243ed5694865b53010fdb36a5005bdc4b8199973
[automerger skipped] Merge "Convert Settings to Android.bp" am: 06dfd75660 am: 8ddf9e7e3f -s ours am: c1b598b218 -s ours
am: 243ed56948 -s ours
am skip reason: change_id I267534c095c30833f77273dbdb1893b7830ed45d with SHA1 946a0fd964 is in history

Change-Id: I851b13ea1260eb67e615966c3af8d52644fbd14a