OSDN Git Service

am 98ec5660: Merge "Re-add default sms_short_codes." into jb-mr1-dev
authorRobert Greenwalt <rgreenwalt@google.com>
Tue, 2 Oct 2012 22:52:18 +0000 (15:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 2 Oct 2012 22:52:18 +0000 (15:52 -0700)
* commit '98ec56604dc3d150e47e1605b33a4ae40dbc7f5c':
  Re-add default sms_short_codes.


Trivial merge