OSDN Git Service

Merge "resolve merge conflicts of 943187668c44 to oc-dev-plus-aosp" into oc-dev-plus...
authorRobin Lee <rgl@google.com>
Thu, 30 Mar 2017 16:49:53 +0000 (16:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 30 Mar 2017 16:49:57 +0000 (16:49 +0000)
commit1f3f5955bb627f418379fd2d6fb02e03fb2768ce
tree8e69e0ba1a68163db8ad3992a933d3864786daa2
parent3d02cf4c212121ca2c3dba41564584ee782210bf
parent913554a06818f44dc5fd0fb77673f8fd0e2d32d2
Merge "resolve merge conflicts of 943187668c44 to oc-dev-plus-aosp" into oc-dev-plus-aosp