OSDN Git Service

Merge changes from topic "am-3290ac2a-4a57-4151-aaf8-9695d2ed6348" into oc-dev
authorMyles Watson <mylesgw@google.com>
Fri, 2 Nov 2018 23:01:24 +0000 (16:01 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Nov 2018 23:01:24 +0000 (16:01 -0700)
commit28c5c4ab205be21d393feb96aca9ceab14c6a57f
tree19bc985cd5acb19866bb4ed2436c934e0fe844ee
parentc5c82d09b418b705ee918d361000a4a2e711a0c0
parent74749c1996c375324b5d9f44072c00f268c2c349
Merge changes from topic "am-3290ac2a-4a57-4151-aaf8-9695d2ed6348" into oc-dev
am: 74749c1996

Change-Id: Ie0b18788113d43696ee9b0a35c8352bb4bf7c8a2