OSDN Git Service

Merge cherrypicks of [2607234, 2607235, 2606313, 2607236, 2607238, 2607239, 2606314...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 27 Jul 2017 00:30:23 +0000 (00:30 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 27 Jul 2017 00:30:23 +0000 (00:30 +0000)
Change-Id: Ia2067c24c334563afb1f54dca60a79a350d568f0


Trivial merge