OSDN Git Service

Merge "resolve merge conflicts of be23ef368f1a to oc-dev-plus-aosp" into oc-dev-plus...
authorDaniel Sandler <dsandler@android.com>
Tue, 6 Jun 2017 22:53:00 +0000 (22:53 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 6 Jun 2017 22:53:07 +0000 (22:53 +0000)
commit9dd289529d4e4fa04e9aa66d44d6af50d9c6b149
tree661fab4fcaa609e030117dc3bbbb74215badbb81
parent6cae189d2667f050a8c2565b9a71b540c6e7dfe9
parent794bcd27ef0abffd01255dd11991e1bcacc954d7
Merge "resolve merge conflicts of be23ef368f1a to oc-dev-plus-aosp" into oc-dev-plus-aosp