OSDN Git Service

Merge "resolve merge conflicts of 8f8d187 to nyc-dev-plus-aosp" into nyc-dev-plus...
authorRobert Sesek <rsesek@google.com>
Thu, 13 Oct 2016 14:13:36 +0000 (14:13 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 13 Oct 2016 14:13:39 +0000 (14:13 +0000)

Trivial merge