OSDN Git Service

resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev
authorJim Miller <jaggies@google.com>
Wed, 15 Oct 2014 20:54:37 +0000 (13:54 -0700)
committerJim Miller <jaggies@google.com>
Wed, 15 Oct 2014 20:54:37 +0000 (13:54 -0700)
commit3ef52587da6fd91fc12164fd57100d6e352508ec
treee1f68d2fe7ff6e75c09e7e0c5c3583144b5027ab
parent6b68b000da5db8df9228ae9f589dfb1f2b38759b
parent46c7f6d6f32efec26bc9343f591ad1ddbe8f3b4a
resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev

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