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)
am: 54ec71200b

Change-Id: Iec5773ff618a7148c867ce79b85196d4152c43df

1  2 
res/values/strings.xml

Simple merge