OSDN Git Service

Merge "Add free short codes for Direct Carrier Billing and others." am: 4d9ffdf952
authorRobert Greenwalt <rgreenwalt@google.com>
Fri, 22 Jan 2016 18:47:17 +0000 (18:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Jan 2016 18:47:17 +0000 (18:47 +0000)
commit9dbd85d87531175a0495a4fddfcb51e3da8fb8a2
tree93b6a1be0aa551f473d1cf4d6a6acdb3ea7ca018
parentaae84105d1b8cfe6144afbb82bc70481cb39f8c8
parentbd92c57a4f74c5c6ea3b6e20964a5e7950a1f7e1
Merge "Add free short codes for Direct Carrier Billing and others." am: 4d9ffdf952
am: bd92c57a4f

* commit 'bd92c57a4f74c5c6ea3b6e20964a5e7950a1f7e1':
  Add free short codes for Direct Carrier Billing and others.
core/res/res/xml/sms_short_codes.xml