OSDN Git Service

Merge cherrypicks of [2454758, 2454859, 2454837, 2454965, 2454984, 2455001, 2454760...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 23 Jun 2017 20:53:57 +0000 (20:53 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 23 Jun 2017 20:53:57 +0000 (20:53 +0000)
Change-Id: I3cd8a20b7940e3541c22af7cbacb71ce6eb3d0d0


Trivial merge