OSDN Git Service

[automerger skipped] Merge changes Ibec13fbe,If89c67c0 am: 27bf33e053 am: e8a6c02fd2...
authorJosh Hou <joshhou@google.com>
Mon, 28 Oct 2019 12:50:14 +0000 (05:50 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 28 Oct 2019 12:50:14 +0000 (05:50 -0700)
am: 0fe6fc26ad -s ours
am skip reason: change_id Ibec13fbeb5acf1d62342286687b2ba969beb4e14 with SHA1 c101faeb2b is in history

Change-Id: I42c0f962b5b2b069a6170fc1b454ec1dcfa4b630


Trivial merge