OSDN Git Service

Merge changes from topic "am-d37d37956b3e49d89a31faaa131fd1fc" into oc-mr1-dev-plus...
authorAndre Eisenbach <eisenbach@google.com>
Sat, 16 Sep 2017 15:33:22 +0000 (15:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 16 Sep 2017 15:33:22 +0000 (15:33 +0000)
am: af7b3b007f  -s ours

Change-Id: Ie9c4ac48cae1b04cd7d7ea2124715349f951a467


Trivial merge