OSDN Git Service

[automerger skipped] Merge "SettingsRoboTests: Remove direct dep on sdk_vcurrent...
authorAnton Hansson <hansson@google.com>
Wed, 18 Apr 2018 12:31:21 +0000 (05:31 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Apr 2018 12:31:21 +0000 (05:31 -0700)
am: cb64305ad3  -s ours

Change-Id: I3629843911d1040f7cab8250050e03c0665a8e5c


Trivial merge