OSDN Git Service

Merge cherrypicks of [2372722, 2371265, 2372622, 2371944, 2372723, 2372703, 2372623...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 7 Jun 2017 20:14:25 +0000 (20:14 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 7 Jun 2017 20:14:25 +0000 (20:14 +0000)
Change-Id: Ieda3b450637699bfb36e2e9c7957f08ffc572805


Trivial merge