OSDN Git Service

Merge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into oc-dev
authorMyles Watson <mylesgw@google.com>
Wed, 7 Feb 2018 21:38:56 +0000 (21:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Feb 2018 21:38:56 +0000 (21:38 +0000)
commit189d1b5135d2bf75590fcf0003e40fe845e3ffaa
tree19cd4275cbea448e6aaa78bd43cac40aa98a10a4
parentc3cb8be6cbe876d6ad3e3221514d5ac4fa859f66
parent4245009354dc82b02590bca4470808dff2702243
Merge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into oc-dev
am: 4245009354

Change-Id: I10def675db30ca0a5c52af4f2cee258201f4560b