OSDN Git Service

Merge changes from topic 'am-52eed220ada34c3aba959fcbb20dfeab' into oc-dr1-dev-plus...
authorJin Qian <jinqian@google.com>
Thu, 6 Jul 2017 16:33:14 +0000 (16:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 16:33:14 +0000 (16:33 +0000)
commit254f75bc42ac98c914b870a36525e27d399771d2
tree0d46ff8fff09b5879bb0d09645aa626d6d4567c8
parent4b8654d9b7d99d1b2b734082db7591424f79a82c
parentbedbcad1de4a5d809e67e7a58000fbceb31dd732
Merge changes from topic 'am-52eed220ada34c3aba959fcbb20dfeab' into oc-dr1-dev-plus-aosp
am: bedbcad1de  -s ours

Change-Id: Ia04208edf12ab5c6f6af09357d8be4545125fad5