OSDN Git Service

Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265...
authorAdam Lesinski <adamlesinski@google.com>
Wed, 5 Jul 2017 21:19:08 +0000 (21:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jul 2017 21:19:08 +0000 (21:19 +0000)
commit207b71a473d84498f12e792c722a69a274427dc4
tree90be00464577528ee13e90f280e18c9b6ed84ef7
parent8876673b99c5095f7406c2c16a1e21f10bf4a371
parenta998cffb1b8dec8352fc00268d21f1983d33fb35
Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265  -s ours" into stage-aosp-master
am: a998cffb1b  -s ours

Change-Id: I15f2cf810bd0f2feb3117dbebe7f15daff281c1f