OSDN Git Service

resolve merge conflicts of 83c367aa5b48 to stage-aosp-master am: 8acdb8aa65 am: 93fcf...
authorNeil Fuller <nfuller@google.com>
Thu, 21 Sep 2017 02:54:31 +0000 (02:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Sep 2017 02:54:31 +0000 (02:54 +0000)
commitc54b59a981dcd5b61b7e0185d9cca8b5dc9aa43e
tree39151a8f1319f73ed2c765871e5b9b50d35daf3a
parentb2eb68da0c3dcbc46dd673e1d243035e47f699eb
parent2540844f6d88533fd1745eb8672ac7b409fb9428
resolve merge conflicts of 83c367aa5b48 to stage-aosp-master am: 8acdb8aa65 am: 93fcfbc8cb  -s ours
am: 2540844f6d

Change-Id: I6fc02e2e892aa101afc2f77a89f27d518886e638