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:08:32 +0000 (03:08 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Jun 2019 10:08:32 +0000 (03:08 -0700)
commit28a8e8b8484641ea4eeb2ff6f24069077437dc67
treeb82067f63e17eabf48e29478e9172333e36e2af0
parent35f2cb15f1dfcff789ab0580fe2a5cd2b439680b
parent38535adcd0d83060dee8ee87abd80234b19d0f03
[automerger skipped] Merge changes from topic "am-e3f94184-0df3-403b-b2dc-4ebd50beee32" into oc-dev
am: 38535adcd0 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1 461f0b4739 is in history

Change-Id: I14e6e0212fd40a7a74cc9f4672cd8ce611763761