OSDN Git Service

Merge changes from topic "am-a3017cc6c28740f4a52f9ef5d5b9be0e" into oc-dev
authorMyles Watson <mylesgw@google.com>
Wed, 7 Feb 2018 21:47:12 +0000 (21:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Feb 2018 21:47:12 +0000 (21:47 +0000)
commite6f7fd7edd4eac33a4a721af3a1ed6a07514cb46
tree19cd4275cbea448e6aaa78bd43cac40aa98a10a4
parentba2c15b8c2a0d4c80b2feb75ac2049a086220ae0
parentd936f1f22f15c4b1b327abd8615b0b2ef66a6937
Merge changes from topic "am-a3017cc6c28740f4a52f9ef5d5b9be0e" into oc-dev
am: d936f1f22f

Change-Id: I31c1da3e1ca08ac5f697ff344ca067084ada18f8