diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-06-14 17:09:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-14 17:09:01 -0700 |
| commit | a3e74b9e2af780a6395d89e10121fb9d72852e2c (patch) | |
| tree | 371f07dcdde04701d587cb9751214b6d5b1d2b9f /res/values-sw | |
| parent | 103c5b04d678212a25d52301d0b4062b93f9e945 (diff) | |
| parent | e0279d33974a095b12abfe33f3e0be84b5e7b7d0 (diff) | |
| download | android_packages_apps_Gallery2-a3e74b9e2af780a6395d89e10121fb9d72852e2c.tar.gz android_packages_apps_Gallery2-a3e74b9e2af780a6395d89e10121fb9d72852e2c.tar.bz2 android_packages_apps_Gallery2-a3e74b9e2af780a6395d89e10121fb9d72852e2c.zip | |
am e0279d33: resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aosp
* commit 'e0279d33974a095b12abfe33f3e0be84b5e7b7d0':
Gallery2: Check privative effects
Diffstat (limited to 'res/values-sw')
0 files changed, 0 insertions, 0 deletions