OSDN Git Service

am 69827524: Try to fix bug3119318 without breaking the build this time
authorRoy West <rwest@google.com>
Fri, 22 Oct 2010 00:53:37 +0000 (17:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 Oct 2010 00:53:37 +0000 (17:53 -0700)
commitd2927990ffe0d8ac385e16a38c189ace00065cff
tree241a29048bb671fa3e437ab3764ee2fdd8daebf5
parent340db2bafa9b7649a5cadeb2a9c06e451901a8a4
parent69827524365ae448d19b2089c46534e925cc2bfd
am 69827524: Try to fix bug3119318 without breaking the build this time

Merge commit '69827524365ae448d19b2089c46534e925cc2bfd' into gingerbread-plus-aosp

* commit '69827524365ae448d19b2089c46534e925cc2bfd':
  Try to fix bug3119318 without breaking the build this time
res/values/strings.xml