OSDN Git Service

resolve merge conflicts of de67e0b to nyc-mr1-dev-plus-aosp
authorpkanwar <pkanwar@google.com>
Fri, 6 May 2016 01:53:08 +0000 (18:53 -0700)
committerpkanwar <pkanwar@google.com>
Fri, 6 May 2016 01:53:08 +0000 (18:53 -0700)
commit7fe0c25f77e30c63eb486ae340ff8b1ce82c190c
treeb847157ea0ca936a68b93b3c4f255544c2898514
parentb4e93c2a83b4f933a931ede73f8df8f7964045d1
parentde67e0b0cd575628457b02ed760b9d38b2b456b7
resolve merge conflicts of de67e0b to nyc-mr1-dev-plus-aosp

Change-Id: I9213ec0dc937bd20ff705f4deb41c10a4e69c227
res/values/strings.xml