OSDN Git Service

Merge changes from topic "am-281eb700-c15a-44d3-a49f-153f9323e62a" into oc-dev am...
authorBill Yi <byi@google.com>
Mon, 16 Apr 2018 19:20:42 +0000 (12:20 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 Apr 2018 19:20:42 +0000 (12:20 -0700)
commitf84cc88320b3506fddbab25cb8c067f3196bbe26
tree38b3b21dab6b01c9f00d88b1a96682ca9a879ebc
parent0af21ab046fe25faf47b71438810e99b2007e801
parent60fb81edda47a733c544ee6a4e16415bafa15cb7
Merge changes from topic "am-281eb700-c15a-44d3-a49f-153f9323e62a" into oc-dev am: 231719b4d2
am: 60fb81edda

Change-Id: I5933e96aa34fc6aff073513bdb0400fd02796e62