diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2016-02-23 19:56:32 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-02-23 19:56:32 +0000 |
commit | dfaeff757d6cefb2ed360e0f588117021b06b3f4 (patch) | |
tree | f3ede0d2b6ecba1fd02b42b5ff6ba19d95e4854a /res/values-en-rGB/strings.xml | |
parent | 1a187d4e3750e335a05eb83e73afedb8b03b3e1a (diff) | |
parent | d31dcbcc7c7901959c65c4e635e59274a1d4c334 (diff) | |
download | android_packages_apps_Trebuchet-dfaeff757d6cefb2ed360e0f588117021b06b3f4.tar.gz android_packages_apps_Trebuchet-dfaeff757d6cefb2ed360e0f588117021b06b3f4.tar.bz2 android_packages_apps_Trebuchet-dfaeff757d6cefb2ed360e0f588117021b06b3f4.zip |
Manual revert due to conflict:
am: d31dcbcc7c
* commit 'd31dcbcc7c7901959c65c4e635e59274a1d4c334':
Manual revert due to conflict:
Diffstat (limited to 'res/values-en-rGB/strings.xml')
0 files changed, 0 insertions, 0 deletions