OSDN Git Service

Merge cherrypicks of [2089422, 2053944, 2094094, 2007730, 2072002, 2065088, 1989895...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 20 Apr 2017 22:39:41 +0000 (22:39 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 20 Apr 2017 22:39:41 +0000 (22:39 +0000)
Change-Id: Ibcb6be2c5641ce560673032d48ecaf7b3055b5e9


Trivial merge