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:47:49 +0000 (05:47 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jul 2018 12:47:49 +0000 (05:47 -0700)
commitebd4902d00c8c018db002bb05226861cec2e52e3
treeb24e06e3a8029819fedbd0979267f9bde82a78f2
parentabceaf0fe785289b5dd81662a64c622e3dbbdd7b
parentc61957fc79d8460a19f628f0a43d8fd26d6e6366
[automerger skipped] Merge changes from topic "am-2044de95-4296-4a37-b01a-af14ae6c2920" into oc-dev
am: c61957fc79  -s ours

Change-Id: I80698043abd89109bb84f53051e56f75066ae78c