OSDN Git Service

am 6504d74b: am 72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1
authorJohn Wang <johnwang@google.com>
Mon, 14 Nov 2011 20:14:09 +0000 (12:14 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 14 Nov 2011 20:14:09 +0000 (12:14 -0800)
commit196c215a8b89499a353cf023488a04888431a6b0
tree80126f5a7f4c6a927640e2fce4525748a5cb9c95
parentd8fa1ad4523b6c04cab663ff4b65181fc00594d9
parent6504d74b8f7b98f7c2d5fb550042c644510d5f34
am 6504d74b: am 72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1

* commit '6504d74b8f7b98f7c2d5fb550042c644510d5f34':
  [maguro] Fix STK issues
core/res/res/values/strings.xml