OSDN Git Service

Merge "resolve merge conflicts of 0b58f19 to nyc-mr1-dev-plus-aosp" into nyc-mr1...
authorRobert Sesek <rsesek@google.com>
Fri, 14 Oct 2016 14:07:57 +0000 (14:07 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 14 Oct 2016 14:08:00 +0000 (14:08 +0000)
commit856a791ddddf136f2da02a6f9a9b8097052e4bc0
treebedea28a617cb14bac919266fc1539a01e084750
parent2e98bb8d48937f063db32510536be6666f8fa153
parentaa3c463a5ba487c40a21a6a9709585e0b94fe792
Merge "resolve merge conflicts of 0b58f19 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp