OSDN Git Service

resolved conflicts for merge of 2a612605 to master
authorKenny Root <kroot@google.com>
Fri, 15 Oct 2010 21:22:09 +0000 (14:22 -0700)
committerKenny Root <kroot@google.com>
Fri, 15 Oct 2010 21:22:09 +0000 (14:22 -0700)
commit4965e889cfe75aa7f05b8d195143a9bdbc0008b3
tree3a2c9d6e89705156b7f2f2ae19059651a8e4d4a1
parent6d3aa67bdaf408cce04618811cae180f4540af47
parent2a612605f5d71aaa70fd64238923635554828edb
resolved conflicts for merge of 2a612605 to master

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