OSDN Git Service

[automerger skipped] Merge "Update SettingsRoboTests for truth 0.42" am: 1e342c5be6
authorColin Cross <ccross@android.com>
Wed, 17 Apr 2019 23:35:07 +0000 (16:35 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 Apr 2019 23:35:07 +0000 (16:35 -0700)
am: 2df12ab3bb -s ours
am skip reason: change_id I32cb2fcf6094675f79d2fc24702ef6298a9691e4 with SHA1 cdf284b732 is in history

Change-Id: I4a0e8480124ad9d96ba3be26faf41cfe80b1c047


Trivial merge