OSDN Git Service

[automerger skipped] Merge changes from topic "am-ee7381fd1a8845c99ba642b88f8db9d4...
authorJack Yu <jackyu@google.com>
Wed, 3 Apr 2019 04:31:11 +0000 (21:31 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 Apr 2019 04:31:11 +0000 (21:31 -0700)
commita4d0bd441cfcbbe91f68a2865ca94184d960318c
tree8d5eb2d70b1169105f38a75c83ba51dc1b21c76c
parent71757ccdb8af48439825347e87a3372d51eaad3f
parentf2b4fcbaccd31107f8833b6b3e6c5d429a9dddd9
[automerger skipped] Merge changes from topic "am-ee7381fd1a8845c99ba642b88f8db9d4" into stage-aosp-master
am: f2b4fcbacc -s ours
am skip reason: change_id Ib152f97711441fded998a36528ef007f9e28ccbf with SHA1 27ff407104 is in history

Change-Id: I91228bb25d5d27440dbb8fe6297dfc91ac83bec5