diff options
| author | Etan Cohen <etancohen@google.com> | 2015-04-25 00:49:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-25 00:51:57 +0000 |
| commit | a0128ff0bfe0a21681c3f3686bc8a03547e74ca2 (patch) | |
| tree | 1eccd959cf9710452e84f4ff6d2037612409ddfb /res/values-ja/strings.xml | |
| parent | 93564706e1255e649ecd3c6efc7f1c8fb0660bc7 (diff) | |
| parent | a09725c51373161d9a5a70407cf228e8be844a1c (diff) | |
| download | packages_apps_Settings-a0128ff0bfe0a21681c3f3686bc8a03547e74ca2.zip packages_apps_Settings-a0128ff0bfe0a21681c3f3686bc8a03547e74ca2.tar.gz packages_apps_Settings-a0128ff0bfe0a21681c3f3686bc8a03547e74ca2.tar.bz2 | |
Merge changes from topic 'mwd-merge-042415'
* changes:
Merge commit '377c7c9' into merge2
Merge commit '22ffff6' into merge2
Diffstat (limited to 'res/values-ja/strings.xml')
0 files changed, 0 insertions, 0 deletions