OSDN Git Service

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

Change-Id: I53f809d0fcf3130687dc13606b55c4daea9f7d4b


Trivial merge