OSDN Git Service

Merge "resolve merge conflicts of e8a3ea8 to nyc-mr1-dev-plus-aosp" into nyc-mr1...
authorScott Main <smain@google.com>
Wed, 31 Aug 2016 18:24:52 +0000 (18:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 31 Aug 2016 18:24:54 +0000 (18:24 +0000)

Trivial merge