OSDN Git Service

Merge changes from topic "am-123d1192465c41d68296e6dc685616c6" into oc-dev
authorMyles Watson <mylesgw@google.com>
Wed, 7 Feb 2018 21:46:30 +0000 (21:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Feb 2018 21:46:30 +0000 (21:46 +0000)
commitba2c15b8c2a0d4c80b2feb75ac2049a086220ae0
tree19cd4275cbea448e6aaa78bd43cac40aa98a10a4
parenta3292e76a4b1ea321ad136dfdf73553cf2bac5bf
parent50154c463a942280a70cbec85b3e9ef12f8bcfd3
Merge changes from topic "am-123d1192465c41d68296e6dc685616c6" into oc-dev
am: 50154c463a

Change-Id: Ia7e83c29894b0e8eb0a7669485cfabc2ae1bd00c