OSDN Git Service

Merge changes from topic "am-f5dc500e-4d32-4849-891e-c618cef666de" into oc-dev
authorAtanas Kirilov <akirilov@google.com>
Tue, 5 Jun 2018 19:37:52 +0000 (19:37 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 5 Jun 2018 19:37:52 +0000 (19:37 +0000)
commitc3b4881ea50b12cc02cd9e9ab3b09b2150b63c02
tree139f812c8f7409525c85c4d4c749e491036f951c
parent6064d8fd4c56d97977d37e71710edba2f7743164
parent6e4eaec69b2461f9fafe74697ade4a0af60245c7
Merge changes from topic "am-f5dc500e-4d32-4849-891e-c618cef666de" into oc-dev

* changes:
  [automerger] Make safe label more safe am: 2263da9539 am: 05086b1008 am: 77f449068a am: 46f4563313 am: 6be1d6713f
  [automerger] Make safe label more safe am: 2263da9539 am: 05086b1008 am: 77f449068a am: 46f4563313
  [automerger] Make safe label more safe am: 2263da9539 am: 05086b1008 am: 77f449068a
  [automerger] Make safe label more safe am: 2263da9539 am: 05086b1008
  [automerger] Make safe label more safe am: 2263da9539
  Make safe label more safe