OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE" am: 13faf565ff -s ours
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 7 Dec 2018 02:23:03 +0000 (18:23 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Dec 2018 02:23:03 +0000 (18:23 -0800)
commit3ff855c94c114fce5af465b12098dec804ecba8d
treec8c73b2d9e82bd138cec6b59fefdcd0f3d85eba7
parent087fedaf9db34bc85cd9e3e9f2e3921cb58654de
parenta09f89ac50db06c7c2a198dd13b38ed69690ba64
[automerger skipped] Merge "DO NOT MERGE" am: 13faf565ff  -s ours
am: a09f89ac50  -s ours

Change-Id: I6ded7423b1ce7fa96cac2f21f9a723dae04006bf