OSDN Git Service

Merge "resolve merge conflicts of 695f21a66189 to oc-dr1-dev" into oc-dr1-dev
authorIan Pedowitz <ijpedowitz@google.com>
Thu, 8 Jun 2017 05:42:13 +0000 (05:42 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 8 Jun 2017 05:42:18 +0000 (05:42 +0000)
commitbe261948cb8a21a8e145f1f512f6f6bacbd28f34
treef773ec82251630d53ac1c137713084780a556273
parent89d6859dc4d9072df1cc7054fcecfe75f5fc79be
parenta27856d443ce65271aa16ea22a7b413e9dd9c664
Merge "resolve merge conflicts of 695f21a66189 to oc-dr1-dev" into oc-dr1-dev