OSDN Git Service

resolve merge conflicts of 6ecc54a7 to stage-aosp-master am: 227fe277bf
authorsqian <shuoq@google.com>
Tue, 18 Jul 2017 23:57:59 +0000 (23:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 23:57:59 +0000 (23:57 +0000)
commit26ce593c1ee8d82655859b84d6691c7260495184
treed5abd73f978a4c5e50a752b975ce2bc6c1af246c
parentd640e70bb5ccaf9c98937641a01246181edaa92f
parentc278e0ae17845651a74ca143e7f42f8c75612336
resolve merge conflicts of 6ecc54a7 to stage-aosp-master am: 227fe277bf
am: c278e0ae17  -s ours

Change-Id: I5286e807f04a839eeb5fbcddf8a278354979b58a