OSDN Git Service

Merge "resolve merge conflicts of 187fe9d5cf3c to oc-dr1-dev-plus-aosp" into oc-dr1...
authorChen Xu <fionaxu@google.com>
Thu, 22 Jun 2017 19:23:19 +0000 (19:23 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 22 Jun 2017 19:23:31 +0000 (19:23 +0000)
commit595ff996dda313b4fa0b0c6549c1a816372b9163
tree2f3a396e3dcec7e2c3e33fbf155bbcfabc810bcd
parenta31688b8cbff2a212b6d4620872dbbc0cde3fd69
parent35276a6696fb25adb613411b0f5b5d4b6869ab05
Merge "resolve merge conflicts of 187fe9d5cf3c to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp