OSDN Git Service

Merge cherrypicks of [2461233, 2461302, 2461279, 2461176, 2461341, 2461280, 2461290...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 26 Jun 2017 20:47:34 +0000 (20:47 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 26 Jun 2017 20:47:34 +0000 (20:47 +0000)
Change-Id: I15b7b001bbb607686ae6b3e4bdcb496c79751481


Trivial merge