OSDN Git Service

[automerger skipped] Merge changes from topic "am-2044de95-4296-4a37-b01a-af14ae6c292...
authorJakub Pawlowski <jpawlowski@google.com>
Fri, 13 Jul 2018 12:51:54 +0000 (05:51 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jul 2018 12:51:54 +0000 (05:51 -0700)
commit5456b634ad7401e1db9c87e3c5f9b5b046f11933
tree18ef5ecb0db47ad3dee5c82ca715c2c9f2466b52
parent3476c0672b856fc6fd2e671768bceb21594e5425
parentebd4902d00c8c018db002bb05226861cec2e52e3
[automerger skipped] Merge changes from topic "am-2044de95-4296-4a37-b01a-af14ae6c2920" into oc-dev am: c61957fc79  -s ours
am: ebd4902d00  -s ours

Change-Id: I653f9c6173defe2936d0529ee1aef350671ceec5