diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-03-28 08:39:22 -0700 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2012-03-28 08:39:22 -0700 |
commit | 39a8caceff37535788c327a3784503bce90edd1e (patch) | |
tree | ace037b77765916e0aec25914c21b659c16f1e8f /overlay/packages/apps/Mms/res/xml-mcc310-mnc260 | |
parent | 2311cb2fc4d007620ce81b9776271b97b2b45edc (diff) | |
parent | 87f8d661b3330fc8da5362a70a86d3807be2c728 (diff) | |
download | device_samsung_maguro-39a8caceff37535788c327a3784503bce90edd1e.zip device_samsung_maguro-39a8caceff37535788c327a3784503bce90edd1e.tar.gz device_samsung_maguro-39a8caceff37535788c327a3784503bce90edd1e.tar.bz2 |
resolved conflicts for merge of 87f8d661 to master
Change-Id: I8681e2c7391be8857ead09430df2e08010ddbe7a
Diffstat (limited to 'overlay/packages/apps/Mms/res/xml-mcc310-mnc260')
0 files changed, 0 insertions, 0 deletions