OSDN Git Service

Merge "Purr. am: 610f6ede25 am: 0e792f567a" into nyc-mr1-dev-plus-aosp
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 28 Jun 2016 07:15:58 +0000 (07:15 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 28 Jun 2016 07:15:59 +0000 (07:15 +0000)

Trivial merge