OSDN Git Service

Merge cherrypicks of [3478238, 3478653, 3478239, 3478580, 3478612, 3478240, 3478654...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 18 Jan 2018 22:44:15 +0000 (22:44 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 18 Jan 2018 22:44:15 +0000 (22:44 +0000)
Change-Id: I7518bb5d1823226d72989c675f6915f1753b55a9


Trivial merge