OSDN Git Service

Merge changes from topic "R"
authorDan Willemsen <dwillemsen@google.com>
Sat, 20 Apr 2019 02:17:46 +0000 (19:17 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 20 Apr 2019 02:17:46 +0000 (19:17 -0700)
am: 39a77f1951

Change-Id: I32a27fb346e236a6836d4c139cac2fb4cfdb733d


Trivial merge