OSDN Git Service

resolve merge conflicts of f2801e4 to nyc-mr1-dev am: b01c080b08 am: be3924c1b6
authorLorenzo Colitti <lorenzo@google.com>
Fri, 7 Oct 2016 01:27:38 +0000 (01:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Oct 2016 01:27:38 +0000 (01:27 +0000)
commit5a6307010994a81d6691d0eec9fe938fe5986244
treece7af2646664f65ba46f6e1cf907aae491c75a87
parent9fa8e96b6f0dbd747912c7c043da2e49303450f5
parent54ec71200b5ea29f88e07e6a29312ec5a55bc54b
resolve merge conflicts of f2801e4 to nyc-mr1-dev am: b01c080b08 am: be3924c1b6
am: 54ec71200b

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