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)

Trivial merge