OSDN Git Service

Merge cherrypicks of [2007123, 2089669, 2072002, 2094113, 1989895, 2094094, 2017568...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 21 Apr 2017 20:42:02 +0000 (20:42 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 21 Apr 2017 20:42:02 +0000 (20:42 +0000)
Change-Id: I744c621a943d3657db09c7f4d9b3eef92bae387e


Trivial merge