OSDN Git Service

Merge changes from topic '62033391' into oc-dr1-dev
authorTarandeep Singh <tarandeep@google.com>
Wed, 2 Aug 2017 23:00:21 +0000 (23:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 23:00:21 +0000 (23:00 +0000)
am: 97d1c4f234

Change-Id: I33111bae2e009087d979b5f83b0d76a6ba9328c1


Trivial merge