OSDN Git Service

Merge cherrypicks of [2310999, 2310925, 2310891, 2311000, 2310892, 2310858, 2310986...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 24 May 2017 22:53:55 +0000 (22:53 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 24 May 2017 22:53:55 +0000 (22:53 +0000)
Change-Id: Iaca90436dbd44ed8bd2629340441480ea362844c


Trivial merge