OSDN Git Service

Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am...
authorDoris Ling <dling@google.com>
Thu, 9 Aug 2018 19:20:08 +0000 (12:20 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Aug 2018 19:20:08 +0000 (12:20 -0700)
commit949e45c8afa6114232e50e56c684ecbe221e0bf4
tree9062cffebe3ec80057da014e7d15c6eafa59bf93
parentf2335b6567ae29a5c79a0126fcaa32625994df3a
parentad04140966a9abfbb0087df25eb7440ba11975b3
Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am: 528be61eeb am: 78a7ee2f10 am: d1146af517
am: ad04140966

Change-Id: I14f35ecc0ac25bf95506b1ec5458a8dcf4b9b3ff