OSDN Git Service

resolve merge conflicts of 8fa3d44 to nyc-mr1-dev
authorPavlin Radoslavov <pavlin@google.com>
Sat, 7 May 2016 01:57:18 +0000 (18:57 -0700)
committerPavlin Radoslavov <pavlin@google.com>
Sat, 7 May 2016 01:57:18 +0000 (18:57 -0700)
commit3d4a586b80f6862f3f2452e07afad13f7b380133
treef1ca9e1e4dd61313f89c7393ff7f6591d191d881
parentcf7d2727c7d3e646d1e3b082e44e18e64a17619b
parent8fa3d44596e75cbc03f1eb5b478133360227bc66
resolve merge conflicts of 8fa3d44 to nyc-mr1-dev

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