OSDN Git Service

resolve merge conflicts of 83c367aa5b48 to stage-aosp-master am: 8acdb8aa65
authorNeil Fuller <nfuller@google.com>
Wed, 20 Sep 2017 15:39:37 +0000 (15:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Sep 2017 15:39:37 +0000 (15:39 +0000)
commit2540844f6d88533fd1745eb8672ac7b409fb9428
tree6d7f7697f0b895c79593b4606fafc7377de468a6
parent656c519dd7be6de66c5fbbad1517eed052730921
parent93fcfbc8cbf291eccc0eaa41ef3dbdaecfa7dc77
resolve merge conflicts of 83c367aa5b48 to stage-aosp-master am: 8acdb8aa65
am: 93fcfbc8cb  -s ours

Change-Id: I5eb5f54262cbcb38095ff5a6092c200c839e6987