diff options
| author | Wei Wang <weiwa@google.com> | 2014-01-14 23:33:32 -0800 |
|---|---|---|
| committer | Wei Wang <weiwa@google.com> | 2014-01-14 23:42:41 -0800 |
| commit | ab4029665bf231459b6a0da34a47e795412c7a57 (patch) | |
| tree | c6abf683bf0d75c8d9699472f72001223539d40a /res/values-ms-rMY | |
| parent | eeb60f9473f2e070228cfaec75e757413a50dcba (diff) | |
| parent | f4f8d9f34669bc67b8cd93e7dc060dfddf3a7e51 (diff) | |
| download | packages_apps_Settings-ab4029665bf231459b6a0da34a47e795412c7a57.zip packages_apps_Settings-ab4029665bf231459b6a0da34a47e795412c7a57.tar.gz packages_apps_Settings-ab4029665bf231459b6a0da34a47e795412c7a57.tar.bz2 | |
Merge commit 'f4f8d9f3' into manualmerge
Conflicts:
res/values/strings.xml
Change-Id: Ifbcd6ef2447dbb95aab0ed1971f63a16ecf8035c
Diffstat (limited to 'res/values-ms-rMY')
0 files changed, 0 insertions, 0 deletions