OSDN Git Service

Merge "Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"" into oc-mr1-dev
authorMatthew Fritze <mfritze@google.com>
Tue, 1 Aug 2017 00:59:44 +0000 (00:59 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 1 Aug 2017 00:59:44 +0000 (00:59 +0000)
commit21b22f01548751131504ce035c9e713b3ec55943
tree4f8544c8eba6ef45d4101943a721b86b0756f124
parentda3462e366eb2e611a83dcd605721648c72459ae
parentfdbf4f057b058237670bab3ba432647536d7bd4e
Merge "Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"" into oc-mr1-dev