OSDN Git Service

Merge "resolve merge conflicts of 83c367aa5b48 to stage-aosp-master am: 8acdb8aa65...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 21 Sep 2017 02:59:27 +0000 (02:59 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 21 Sep 2017 02:59:27 +0000 (02:59 +0000)
commit150a13fab1e44af16ad0b6bee42fc1c2d3b60ca9
tree2c05e18181e534c8d3feaf108daf672a6a1b7734
parentfdb129f3f3715ac52f3f963a896a62bacc149fe3
parentc54b59a981dcd5b61b7e0185d9cca8b5dc9aa43e
Merge "resolve merge conflicts of 83c367aa5b48 to stage-aosp-master am: 8acdb8aa65 am: 93fcfbc8cb  -s ours am: 2540844f6d"