OSDN Git Service

Merge "Fix build breakage due to res-id changes" into nyc-mr1-dev
authorMakoto Onuki <omakoto@google.com>
Sat, 28 May 2016 00:05:16 +0000 (00:05 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 28 May 2016 00:05:17 +0000 (00:05 +0000)

Trivial merge