OSDN Git Service

Merge "resolve merge conflicts of f8187f4e1 to oc-dr1-dev-plus-aosp" into oc-dr1...
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 18 Jul 2017 21:45:42 +0000 (21:45 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 18 Jul 2017 21:45:42 +0000 (21:45 +0000)
commit72f1824c46fcb8c66f5a92c1328508b831c971ae
treeedbb3820b65e00a5f6b983ec2e27204dd3151285
parentb111e153d9a9f6915d22e0e0097c85be4e1363bd
parent3c2a468cd562029e3d09f62f8a1116c4e365b639
Merge "resolve merge conflicts of f8187f4e1 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp