OSDN Git Service

[automerger skipped] Merge changes from topic "am-2d17369d-a241-482f-bad0-edb5147de00...
authorMihai Popa <popam@google.com>
Wed, 6 Jun 2018 19:45:38 +0000 (12:45 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Jun 2018 19:45:38 +0000 (12:45 -0700)
commit564fecfdb78b05d1cfb29ae6c5954cc539006256
tree28d1a2e00ebc3e639e1ec19d790334da6a8f04bd
parentb14e1fdbff9977635465d6f944e443dddeb42d1c
parent999d9e1bf026e92699b1c20da1286498d2424f2d
[automerger skipped] Merge changes from topic "am-2d17369d-a241-482f-bad0-edb5147de00b" into oc-dev am: 3fce74a7f3  -s ours am: bb18c011aa  -s ours am: 7478894a89  -s ours
am: 999d9e1bf0  -s ours

Change-Id: I92c4e0edf71e7f92400395af8aa2828bb9ab395f