OSDN Git Service

Merge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into nyc-mr2-dev...
authorMyles Watson <mylesgw@google.com>
Wed, 7 Feb 2018 21:39:25 +0000 (21:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Feb 2018 21:39:25 +0000 (21:39 +0000)
am: b184d4f110

Change-Id: I4e3c614fa2847bdc4005bd1e284df3c595508104


Trivial merge