OSDN Git Service

am 8bf6cbb9: am 94195fa6: am 98ec5660: Merge "Re-add default sms_short_codes." into...
authorRobert Greenwalt <rgreenwalt@google.com>
Tue, 2 Oct 2012 22:58:06 +0000 (15:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 2 Oct 2012 22:58:06 +0000 (15:58 -0700)
* commit '8bf6cbb958f880168af9dd34644f8c9864190613':
  Re-add default sms_short_codes.

1  2 
core/res/res/values/symbols.xml

Simple merge