OSDN Git Service

Merge "resolve merge conflicts of a03a707f74 to oc-mr1-dev-plus-aosp" into oc-mr1...
authorMatthew Fritze <mfritze@google.com>
Tue, 1 Aug 2017 00:28:57 +0000 (00:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 1 Aug 2017 00:28:57 +0000 (00:28 +0000)
commit7907bd215d834f6ecb2b2eff0bb8d206b549f7b5
treede627f2bc83b02b773cf154a6eb34647dd5aba4c
parent666d70ea76536c7b05e6dbc51d2aa26568e5ee63
parent57b641eee8050c6d30872fbaf464a63270c4c833
Merge "resolve merge conflicts of a03a707f74 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp