OSDN Git Service

Merge "Merge changes I036fbc5f,I979f0107 into nyc-dev am: 60b688876d am: a5f89b13a8...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 21 Apr 2016 22:43:06 +0000 (22:43 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 21 Apr 2016 22:43:08 +0000 (22:43 +0000)

Trivial merge