diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-09-20 12:49:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-20 12:49:04 -0700 |
| commit | a0646d0f8e6f597bc6da6ae1fc15909eb2afdacf (patch) | |
| tree | 526d1932f7d23021edcdb68602f404c489f6dc0c /photoviewer | |
| parent | 01007eb766b9fbc18116b401d5d1c086e6f5515d (diff) | |
| parent | b060fe28670601e6885f6375a9c06124a5be7389 (diff) | |
| download | android_frameworks_ex-a0646d0f8e6f597bc6da6ae1fc15909eb2afdacf.tar.gz android_frameworks_ex-a0646d0f8e6f597bc6da6ae1fc15909eb2afdacf.tar.bz2 android_frameworks_ex-a0646d0f8e6f597bc6da6ae1fc15909eb2afdacf.zip | |
am b060fe28: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'b060fe28670601e6885f6375a9c06124a5be7389':
Diffstat (limited to 'photoviewer')
0 files changed, 0 insertions, 0 deletions