OSDN Git Service

Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265 -s ours
authorAdam Lesinski <adamlesinski@google.com>
Wed, 5 Jul 2017 21:16:55 +0000 (21:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jul 2017 21:16:55 +0000 (21:16 +0000)
commit8f09557150c79676b20825d8625b182a3579cedd
tree90be00464577528ee13e90f280e18c9b6ed84ef7
parent0278aa4b7011e33ea0b27a0bc5f69484bbea2bca
parent1ebe18d6918cba9774698ebada7c29a499c5ece6
Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265  -s ours
am: 1ebe18d691  -s ours

Change-Id: I407815d637dadf8416c8df715b533e2eb3edee2e