diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2016-02-23 20:01:59 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-02-23 20:01:59 +0000 |
commit | 15dc5f4eb62d9daf314011b47c5aa0fa0bee71d3 (patch) | |
tree | f3ede0d2b6ecba1fd02b42b5ff6ba19d95e4854a /res/values-v21 | |
parent | 7df377a1c7247555ef4c9a84bd7e9b6b7db0d2a6 (diff) | |
parent | dfaeff757d6cefb2ed360e0f588117021b06b3f4 (diff) | |
download | android_packages_apps_Trebuchet-15dc5f4eb62d9daf314011b47c5aa0fa0bee71d3.tar.gz android_packages_apps_Trebuchet-15dc5f4eb62d9daf314011b47c5aa0fa0bee71d3.tar.bz2 android_packages_apps_Trebuchet-15dc5f4eb62d9daf314011b47c5aa0fa0bee71d3.zip |
Manual revert due to conflict: am: d31dcbcc7c
am: dfaeff757d
* commit 'dfaeff757d6cefb2ed360e0f588117021b06b3f4':
Manual revert due to conflict:
Diffstat (limited to 'res/values-v21')
0 files changed, 0 insertions, 0 deletions