OSDN Git Service

[automerger skipped] Merge changes from topic "am-e3f94184-0df3-403b-b2dc-4ebd50beee3...
authorJakub Pawlowski <jpawlowski@google.com>
Fri, 7 Jun 2019 10:12:23 +0000 (03:12 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Jun 2019 10:12:23 +0000 (03:12 -0700)
commitc5837d3d8192907398e54e98d657e50dc5508de8
treeb03e82ff8a9becdb9c7a4753b62f3dc03ed00cfc
parent75384547fb5737bece85247c0ab48c01e35ce6f3
parent28a8e8b8484641ea4eeb2ff6f24069077437dc67
[automerger skipped] Merge changes from topic "am-e3f94184-0df3-403b-b2dc-4ebd50beee32" into oc-dev am: 38535adcd0 -s ours
am: 28a8e8b848 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1 461f0b4739 is in history

Change-Id: I128d6b1fbeccea202ddaaa73e4a1c9032afdfda1