OSDN Git Service

Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am...
authorDoris Ling <dling@google.com>
Thu, 9 Aug 2018 19:29:06 +0000 (12:29 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Aug 2018 19:29:06 +0000 (12:29 -0700)
am: 949e45c8af

Change-Id: Id3220c286a49072a68bedde9090f8a43bea180ed


Trivial merge