OSDN Git Service

Merge changes from topic 'am-de733d91cb0341aeb2ef16f880922bbc' into oc-mr1-dev-plus...
authorZheng Zhang <zhzh@google.com>
Wed, 9 Aug 2017 19:17:20 +0000 (19:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 19:17:20 +0000 (19:17 +0000)
am: 1fdd206583

Change-Id: I9db451926e0ca73747cf15ce163bd4c4fd708f80


Trivial merge