OSDN Git Service

[automerger skipped] Merge changes from topic "am-2044de95-4296-4a37-b01a-af14ae6c292...
authorJakub Pawlowski <jpawlowski@google.com>
Fri, 13 Jul 2018 13:00:02 +0000 (06:00 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jul 2018 13:00:02 +0000 (06:00 -0700)
commit761d04880544ddb9cd12269a3362b533bcfe35bd
tree2720e044f65dcaccbfb0733303160d420ed9d113
parent4eb019e1be926b570b0dc545ecd66d04f6473d3a
parent2ee9b1867bb49ad8973b9a4c7a574db8dac03358
[automerger skipped] Merge changes from topic "am-2044de95-4296-4a37-b01a-af14ae6c2920" into oc-dev am: c61957fc79  -s ours am: ebd4902d00  -s ours am: 5456b634ad  -s ours
am: 2ee9b1867b  -s ours

Change-Id: I6ae1ed45ee2b4836cde43e08928e9b85921d9e0f