Commits · 1b488e2d3051cc87715365b49713e6b15cfb1401 · halo / packages_apps_Gallery2

09 Nov, 2012 8 commits
- am 46281de7: Import translations. DO NOT MERGE · 1b488e2d
  Baligh Uddin authored 12 years ago
```
* commit '46281de7':
  Import translations. DO NOT MERGE
```
  1b488e2d
- am 139efdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches · f26cba65
  Baligh Uddin authored 12 years ago
```
* commit '139efdbc':
  Import translations. DO NOT MERGE
```
  f26cba65
- am b0aae659: (-s ours) Import translations. DO NOT MERGE · f9121463
  Baligh Uddin authored 12 years ago
```
* commit 'b0aae659':
  Import translations. DO NOT MERGE
```
  f9121463
- Import translations. DO NOT MERGE · b8183269
  Baligh Uddin authored 12 years ago
```
Change-Id: Iff36d4d66adea96bda6dd76700495eb744bf92b8
Auto-generated-cl: translation import
```
  b8183269
- Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches · 139efdbc
  Baligh Uddin authored 12 years ago
  
  139efdbc
- Import translations. DO NOT MERGE · 6694bb76
  Baligh Uddin authored 12 years ago
```
Change-Id: I77990cac84f1cd8e4762bd4d5df314dc52117081
Auto-generated-cl: translation import
```
  6694bb76
- Import translations. DO NOT MERGE · 46281de7
  Baligh Uddin authored 12 years ago
```
Change-Id: I4e9f92985c3e2285d1bb280560fa7fe86bee972f
Auto-generated-cl: translation import
```
  46281de7
- Import translations. DO NOT MERGE · b0aae659
  Baligh Uddin authored 12 years ago
```
Change-Id: Iff36d4d66adea96bda6dd76700495eb744bf92b8
Auto-generated-cl: translation import
```
  b0aae659
08 Nov, 2012 5 commits
- Reconcile with jb-mr1-release - do not merge · b7a115c7
  The Android Open Source Project authored 12 years ago
```
Change-Id: Id8f361c784adbf1b22de8a82b4cbdc2ea3a15bf7
```
  b7a115c7
- merge in jb-mr1-release history after reset to jb-mr1-dev · 56a58dea
  The Android Automerger authored 12 years ago
  
  56a58dea
- am 8253c35a: reduce size of tiny planet if malloc fails - DO NOT MERGE · 4c1614b7
  John Hoford authored 12 years ago
```
* commit '8253c35a':
  reduce size of tiny planet if malloc fails - DO NOT MERGE
```
  4c1614b7
- reduce size of tiny planet if malloc fails - DO NOT MERGE · 8253c35a
  John Hoford authored 12 years ago
```
bug:7477815
Change-Id: I03fec9246e368fb7f929769dc5e5e6266761dc34
```
  8253c35a
- Reconcile with jb-mr1-release - do not merge · d7545049
  The Android Open Source Project authored 12 years ago
```
Change-Id: I8db9fb7159802c84866bdc4edd136c9a75880397
```
  d7545049
07 Nov, 2012 9 commits
- merge in jb-mr1-release history after reset to jb-mr1-dev · 7cf5542b
  The Android Automerger authored 12 years ago
  
  7cf5542b
- am 2a8405d7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev · 3375b227
  Baligh Uddin authored 12 years ago
```
* commit '2a8405d7':
  Import translations. DO NOT MERGE
```
  3375b227
- Merge "Import translations. DO NOT MERGE" into jb-mr1-dev · 2a8405d7
  Baligh Uddin authored 12 years ago
  
  2a8405d7
- Reconcile with jb-mr1-release - do not merge · 5636617c
  The Android Open Source Project authored 12 years ago
```
Change-Id: Id3f4eff2714ec8ba5146b23954cf3cf3e811564b
```
  5636617c
- merge in jb-mr1-release history after reset to jb-mr1-dev · 39758e2c
  The Android Automerger authored 12 years ago
  
  39758e2c
- am da700ab4: am 85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE"... · a6bb1711
  Baligh Uddin authored 12 years ago
```
am da700ab4: am 85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit 'da700ab4':
  Import translations. DO NOT MERGE
```
  a6bb1711
- am 88571794: am 9ec5de9d: Fix scenario where launching Gallery launches Camera · 75bf0030
  Bobby Georgescu authored 12 years ago
```
* commit '88571794':
  Fix scenario where launching Gallery launches Camera
```
  75bf0030
- am 85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches · da700ab4
  Baligh Uddin authored 12 years ago
```
* commit '85d20a07':
  Import translations. DO NOT MERGE
```
  da700ab4
- am 9ec5de9d: Fix scenario where launching Gallery launches Camera · 88571794
  Bobby Georgescu authored 12 years ago
```
* commit '9ec5de9d':
  Fix scenario where launching Gallery launches Camera
```
  88571794
06 Nov, 2012 6 commits
- Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches · 85d20a07
  Baligh Uddin authored 12 years ago
  
  85d20a07
- Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge · 4dd6c535
  The Android Open Source Project authored 12 years ago
```
Change-Id: Ic5ee78e018bd5706185edd8b01de3cb6bf121ed4
```
  4dd6c535
- Import translations. DO NOT MERGE · a9c603e9
  Baligh Uddin authored 12 years ago
```
Change-Id: Ib39956c1bb4450f46f79406ccf1cf67780c63e22
Auto-generated-cl: translation import
```
  a9c603e9
- Import translations. DO NOT MERGE · 134e1c9b
  Baligh Uddin authored 12 years ago
```
Change-Id: I8d3e81b4f27c10ad7b24ada7d7bb066f45dd29c5
Auto-generated-cl: translation import
```
  134e1c9b
- Fix scenario where launching Gallery launches Camera · 9ec5de9d
  Bobby Georgescu authored 12 years ago
```
Bug: 7479102
Change-Id: Ib4676a7149c659897eee1dbbb92ab09861bd0ed4
```
  9ec5de9d
- merge in jb-mr1-release history after reset to jb-mr1-dev · 2a7748a9
  The Android Automerger authored 12 years ago
  
  2a7748a9
05 Nov, 2012 2 commits
- am 954afb2e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev · 78b21f3b
  Baligh Uddin authored 12 years ago
```
* commit '954afb2e':
  Import translations. DO NOT MERGE
```
  78b21f3b
- Merge "Import translations. DO NOT MERGE" into jb-mr1-dev · 954afb2e
  Baligh Uddin authored 12 years ago
  
  954afb2e
04 Nov, 2012 1 commit
- Fix the remaining black blip in secure camera transition. · 613df30f
  John Spurlock authored 12 years ago
```
Bug:7452928
Change-Id: I3f8acd7304e7ff8423f8b1556ae7b0a55eb5a974
```
  613df30f
03 Nov, 2012 1 commit
- merge in jb-mr1-release history after reset to jb-mr1-dev · fad94797
  The Android Automerger authored 12 years ago
  
  fad94797
02 Nov, 2012 8 commits
- am 70fb3773: am b41864f1: Merge "Lock icon in secure album should redirect to... · 5c009849
  Bart Sears authored 12 years ago
```
am 70fb3773: am b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches

* commit '70fb3773':
  Lock icon in secure album should redirect to gallery after unlock.
```
  5c009849
- am b41864f1: Merge "Lock icon in secure album should redirect to gallery after... · 70fb3773
  Bart Sears authored 12 years ago
```
am b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches

* commit 'b41864f1':
  Lock icon in secure album should redirect to gallery after unlock.
```
  70fb3773
- Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches · b41864f1
  Bart Sears authored 12 years ago
  
  b41864f1
- am f350beb8: (-s ours) am 3252800c: (-s ours) Import translations. DO NOT MERGE · 5bfc65cc
  Baligh Uddin authored 12 years ago
```
* commit 'f350beb8':
  Import translations. DO NOT MERGE
```
  5bfc65cc
- am 3252800c: (-s ours) Import translations. DO NOT MERGE · f350beb8
  Baligh Uddin authored 12 years ago
```
* commit '3252800c':
  Import translations. DO NOT MERGE
```
  f350beb8
- Lock icon in secure album should redirect to gallery after unlock. · 19ded6d4
  Wu-cheng Li authored 12 years ago
```
Use FLAG_DISMISS_KEYGUARD so lock screen will be brought up
when launching gallery.

bug:7462572

Change-Id: I345398cc6cfc09901e1ce8309ebdb65cf15088e0
```
  19ded6d4
- Import translations. DO NOT MERGE · ca6b4f81
  Baligh Uddin authored 12 years ago
```
Change-Id: I1a2c893513641927e8324619524c888b7eaa6738
Auto-generated-cl: translation import
```
  ca6b4f81
- Import translations. DO NOT MERGE · ca763558
  Baligh Uddin authored 12 years ago
```
Change-Id: Ie49627da381e12e72468c31322d40bbc3915e7ec
Auto-generated-cl: translation import
```
  ca763558