diff options
author | Matt Garnes <matt@cyngn.com> | 2015-03-17 13:43:50 -0700 |
---|---|---|
committer | Matt Garnes <matt@cyngn.com> | 2015-03-17 13:43:50 -0700 |
commit | d8284f229dfa8d0e2aef3cac0828362e1e6632e1 (patch) | |
tree | 57b913502af687d5a27c3ce3a82b964802b5112c /res/values-et | |
parent | 4c3b2364453fb21dc3f3f8a70e1bcc64e500d83d (diff) | |
parent | 06e3e072e0b70b01dd1d4e2d859d70832d16172c (diff) | |
download | android_packages_apps_Trebuchet-d8284f229dfa8d0e2aef3cac0828362e1e6632e1.tar.gz android_packages_apps_Trebuchet-d8284f229dfa8d0e2aef3cac0828362e1e6632e1.tar.bz2 android_packages_apps_Trebuchet-d8284f229dfa8d0e2aef3cac0828362e1e6632e1.zip |
Merge branch 'github/staging/cm-12.1' into caf/cm-12.1.
Conflicts:
WallpaperPicker/res/values-nodpi/wallpapers.xml
res/layout/settings_pane.xml
res/values-zh-rCN/cm_strings.xml
res/values/preferences_defaults.xml
src/com/android/launcher3/DynamicGrid.java
Change-Id: I22eb2e38e8802985e0e0a8cb3e68d73189c2c1a4
Diffstat (limited to 'res/values-et')
0 files changed, 0 insertions, 0 deletions