OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam 8481c661: am 536c651c: am 8bb4e1a0: Fixes reading exif tags in editor.
Ruben Brunk [Mon, 3 Jun 2013 18:48:04 +0000 (11:48 -0700)]
am 8481c661: am 536c651c: am 8bb4e1a0: Fixes reading exif tags in editor.

* commit '8481c661729888b86f2958de3ac3f4008bcac078':
  Fixes reading exif tags in editor.

11 years agoam 536c651c: am 8bb4e1a0: Fixes reading exif tags in editor.
Ruben Brunk [Mon, 3 Jun 2013 18:45:38 +0000 (11:45 -0700)]
am 536c651c: am 8bb4e1a0: Fixes reading exif tags in editor.

* commit '536c651c7fa0c8e70990ba8ff302cdc98e8c3105':
  Fixes reading exif tags in editor.

11 years agoam 8bb4e1a0: Fixes reading exif tags in editor.
Ruben Brunk [Mon, 3 Jun 2013 18:43:59 +0000 (11:43 -0700)]
am 8bb4e1a0: Fixes reading exif tags in editor.

* commit '8bb4e1a036e67a3bf4f9cdb8f55d6f558189e5b9':
  Fixes reading exif tags in editor.

11 years agoFixes reading exif tags in editor.
Ruben Brunk [Mon, 3 Jun 2013 18:17:08 +0000 (11:17 -0700)]
Fixes reading exif tags in editor.

Bug: 9140401
Change-Id: Ic84efca90c5297ab2c6a65b13d512c4799e623f6

11 years agoam 9e7158e6: (-s ours) am ae6d04d8: am 6d1345aa: (-s ours) Merge "Import translations...
Baligh Uddin [Sat, 1 Jun 2013 16:51:32 +0000 (09:51 -0700)]
am 9e7158e6: (-s ours) am ae6d04d8: am 6d1345aa: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '9e7158e664250b545efc36ab4694ac8e72f59df2':
  Import translations. DO NOT MERGE

11 years agoam b85c039a: (-s ours) am f43b2a96: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Sat, 1 Jun 2013 16:51:31 +0000 (09:51 -0700)]
am b85c039a: (-s ours) am f43b2a96: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit 'b85c039a5134b778c2b2142ed2ba20f3c87cf20e':
  Import translations. DO NOT MERGE

11 years agoam ae6d04d8: am 6d1345aa: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Sat, 1 Jun 2013 15:23:36 +0000 (08:23 -0700)]
am ae6d04d8: am 6d1345aa: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'ae6d04d8ce3717a09a54b8b120f4680ca91036ba':
  Import translations. DO NOT MERGE

11 years agoam f43b2a96: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Sat, 1 Jun 2013 15:23:12 +0000 (08:23 -0700)]
am f43b2a96: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit 'f43b2a96b6606cc6b908cf507688d375c468a74a':
  Import translations. DO NOT MERGE

11 years agoam 6d1345aa: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Sat, 1 Jun 2013 15:20:30 +0000 (08:20 -0700)]
am 6d1345aa: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '6d1345aa496d9f5caedae6b3b0c5b6132fb01893':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 31 May 2013 22:53:59 +0000 (22:53 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 31 May 2013 22:53:44 +0000 (22:53 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 31 May 2013 22:53:29 +0000 (22:53 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoam d49e5609: am f39b88ca: am fb428906: Use hyphenated path for android-support-v8...
Stephen Hines [Thu, 30 May 2013 22:34:08 +0000 (15:34 -0700)]
am d49e5609: am f39b88ca: am fb428906: Use hyphenated path for android-support-v8-renderscript.

* commit 'd49e56097a63a3d4047c2765ff3b13bc76690667':
  Use hyphenated path for android-support-v8-renderscript.

11 years agoam e367d29b: am f322c3af: Merge "Use hyphenated path for android-support-v8-renderscr...
Stephen Hines [Thu, 30 May 2013 22:23:40 +0000 (15:23 -0700)]
am e367d29b: am f322c3af: Merge "Use hyphenated path for android-support-v8-renderscript." into jb-mr2-dev

* commit 'e367d29b0838761f9cd1d7a2983c9cbfb10136b8':
  Use hyphenated path for android-support-v8-renderscript.

11 years agoam 26b52f3c: am 3fac8415: am af65d7ba: Merge "Add HTC One picture resolutions" into...
Michael Kolb [Thu, 30 May 2013 22:23:32 +0000 (15:23 -0700)]
am 26b52f3c: am 3fac8415: am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce

* commit '26b52f3c12169a5776f948a89bb0bcc900a0c356':
  Add HTC One picture resolutions

11 years agoam 4dbf12d1: am 66c23659: am a1db2653: Dismiss settings when showing popup in Video...
Angus Kong [Thu, 30 May 2013 22:15:54 +0000 (15:15 -0700)]
am 4dbf12d1: am 66c23659: am a1db2653: Dismiss settings when showing popup in Video mode.

* commit '4dbf12d1a01e400ccb4d6dc1a5bbc5ca1dfa178a':
  Dismiss settings when showing popup in Video mode.

11 years agoam f39b88ca: am fb428906: Use hyphenated path for android-support-v8-renderscript.
Stephen Hines [Thu, 30 May 2013 22:13:13 +0000 (15:13 -0700)]
am f39b88ca: am fb428906: Use hyphenated path for android-support-v8-renderscript.

* commit 'f39b88cafa70280ff577b018aa6a59e89ee85ee7':
  Use hyphenated path for android-support-v8-renderscript.

11 years agoam fb428906: Use hyphenated path for android-support-v8-renderscript.
Stephen Hines [Thu, 30 May 2013 22:11:53 +0000 (15:11 -0700)]
am fb428906: Use hyphenated path for android-support-v8-renderscript.

* commit 'fb428906549212790a031615c48ba7f8df3f8aa3':
  Use hyphenated path for android-support-v8-renderscript.

11 years agoUse hyphenated path for android-support-v8-renderscript.
Stephen Hines [Wed, 29 May 2013 00:52:03 +0000 (17:52 -0700)]
Use hyphenated path for android-support-v8-renderscript.

Bug: 9188088

Change-Id: Id30e0a67d89419aeb323f43bf5e65321bf862e79
(cherry picked from commit 79f4335753c1cffba15d6c7ea5ec6b7bb3db3f8e)

11 years agoam 53c01796: (-s ours) Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Thu, 30 May 2013 21:24:14 +0000 (14:24 -0700)]
am 53c01796: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '53c017961c78d7ed9e95ec081cf821db2ba91745':

11 years agoam f322c3af: Merge "Use hyphenated path for android-support-v8-renderscript." into...
Stephen Hines [Thu, 30 May 2013 21:10:59 +0000 (14:10 -0700)]
am f322c3af: Merge "Use hyphenated path for android-support-v8-renderscript." into jb-mr2-dev

* commit 'f322c3afa867b423dc803dc2bc2f065f2da1d0bd':
  Use hyphenated path for android-support-v8-renderscript.

11 years agoMerge "Use hyphenated path for android-support-v8-renderscript." into jb-mr2-dev
Stephen Hines [Thu, 30 May 2013 21:08:54 +0000 (21:08 +0000)]
Merge "Use hyphenated path for android-support-v8-renderscript." into jb-mr2-dev

11 years agoam 3fac8415: am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos...
Michael Kolb [Thu, 30 May 2013 20:40:28 +0000 (13:40 -0700)]
am 3fac8415: am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce

* commit '3fac84150826c68fbb1607f7151328ee4ad17f3c':
  Add HTC One picture resolutions

11 years agoam af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce
Michael Kolb [Thu, 30 May 2013 20:38:27 +0000 (13:38 -0700)]
am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce

* commit 'af65d7ba216eba60651d11d248d20346309375ed':
  Add HTC One picture resolutions

11 years agoMerge "Add HTC One picture resolutions" into gb-ub-photos-bryce
Michael Kolb [Thu, 30 May 2013 20:37:33 +0000 (20:37 +0000)]
Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce

11 years agoAdd HTC One picture resolutions
Michael Kolb [Thu, 30 May 2013 15:35:26 +0000 (08:35 -0700)]
Add HTC One picture resolutions

  Bug: 9175168

Fixes bug where preview is not stopped before size changes

Change-Id: I2df136482df68a952c9d3ca5c058ba56ff3a6db8

11 years agoam 66c23659: am a1db2653: Dismiss settings when showing popup in Video mode.
Angus Kong [Thu, 30 May 2013 18:31:12 +0000 (11:31 -0700)]
am 66c23659: am a1db2653: Dismiss settings when showing popup in Video mode.

* commit '66c236598a273c308384423a1d9babce05c79588':
  Dismiss settings when showing popup in Video mode.

11 years agoam a1db2653: Dismiss settings when showing popup in Video mode.
Angus Kong [Thu, 30 May 2013 18:26:57 +0000 (11:26 -0700)]
am a1db2653: Dismiss settings when showing popup in Video mode.

* commit 'a1db26536913f1259ad74c5e6e952521c05bf2f0':
  Dismiss settings when showing popup in Video mode.

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Thu, 30 May 2013 14:31:44 +0000 (07:31 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: Iafe6038c4a1cfd9f5fa19c0aa5697923ac7d3db8

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Thu, 30 May 2013 12:55:54 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 30 May 2013 02:59:17 +0000 (19:59 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib3f5ccf1b233ef453d7f1d62d9a30d6ad0466e9e
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 30 May 2013 02:58:44 +0000 (19:58 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia77532a1e48fb42897f9574cbf02c5deafb0914d
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 30 May 2013 02:58:10 +0000 (19:58 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1d9ab8dc2f246b9456ba677ee3a657306fbefcb7
Auto-generated-cl: translation import

11 years agoDismiss settings when showing popup in Video mode.
Angus Kong [Thu, 30 May 2013 00:15:15 +0000 (17:15 -0700)]
Dismiss settings when showing popup in Video mode.

bug:8771618
Change-Id: I889b794c6732b674e26436f950e81f67529012e7

11 years agoam 9695037c: (-s ours) am cd9e75af: am b3753390: (-s ours) Merge "Import translations...
Baligh Uddin [Wed, 29 May 2013 22:30:24 +0000 (15:30 -0700)]
am 9695037c: (-s ours) am cd9e75af: am b3753390: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '9695037c72a8d291cf731e220acd3807c87e4fb1':
  Import translations. DO NOT MERGE

11 years agoam cd9e75af: am b3753390: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Wed, 29 May 2013 22:26:26 +0000 (15:26 -0700)]
am cd9e75af: am b3753390: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'cd9e75af015aa06d6e37a126d1ee92bfd63496dc':
  Import translations. DO NOT MERGE

11 years agoam ed6bb750: (-s ours) am a7707160: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Wed, 29 May 2013 22:21:29 +0000 (15:21 -0700)]
am ed6bb750: (-s ours) am a7707160: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit 'ed6bb750c1662cff918d157b0ea3d2ce0c7e4108':
  Import translations. DO NOT MERGE

11 years agoam a7707160: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 29 May 2013 22:18:35 +0000 (15:18 -0700)]
am a7707160: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit 'a7707160ba8d9693ffdb813e0eb2cd3f15084a7f':
  Import translations. DO NOT MERGE

11 years agoam b3753390: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 29 May 2013 22:15:01 +0000 (15:15 -0700)]
am b3753390: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'b375339072a32c57ebb06523abeaebd2db29dc08':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 29 May 2013 20:49:55 +0000 (20:49 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 29 May 2013 20:49:26 +0000 (20:49 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 29 May 2013 20:48:44 +0000 (20:48 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoUse hyphenated path for android-support-v8-renderscript.
Stephen Hines [Wed, 29 May 2013 00:52:03 +0000 (17:52 -0700)]
Use hyphenated path for android-support-v8-renderscript.

Bug: 9188088

Change-Id: Id30e0a67d89419aeb323f43bf5e65321bf862e79

11 years agoam a4a4e0b3: (-s ours) Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Wed, 29 May 2013 15:10:33 +0000 (08:10 -0700)]
am a4a4e0b3: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'a4a4e0b3cb74f6cea857ed2c8a4315e1ffc30bac':

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Wed, 29 May 2013 15:06:12 +0000 (08:06 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: I2a6743d468c9daa2f59f5d249964bbe3abb274ca

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Wed, 29 May 2013 12:55:26 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam 9e11dddd: am 00d9601b: am 9fb962fe: Merge "Change the order of exposure compensati...
Doris Liu [Tue, 28 May 2013 20:50:48 +0000 (13:50 -0700)]
am 9e11dddd: am 00d9601b: am 9fb962fe: Merge "Change the order of exposure compensation" into gb-ub-photos-bryce

* commit '9e11dddd508dff7b8d24c56989d70c6ff67ca619':
  Change the order of exposure compensation

11 years agoam c4ef64c8: am c1aaf4b5: am e3336dc3: Merge "Prevent lock screen appearing during...
Bobby Georgescu [Tue, 28 May 2013 20:50:46 +0000 (13:50 -0700)]
am c4ef64c8: am c1aaf4b5: am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce

* commit 'c4ef64c8cc8ba7edc543f64efcb25c401cc94466':
  Prevent lock screen appearing during active slideshow

11 years agoam f6f4abec: (-s ours) Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Tue, 28 May 2013 20:50:18 +0000 (13:50 -0700)]
am f6f4abec: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'f6f4abec09afda4d802ac0b7b2006d86a6161892':

11 years agoam 00d9601b: am 9fb962fe: Merge "Change the order of exposure compensation" into...
Doris Liu [Tue, 28 May 2013 17:46:17 +0000 (10:46 -0700)]
am 00d9601b: am 9fb962fe: Merge "Change the order of exposure compensation" into gb-ub-photos-bryce

* commit '00d9601b666106c3a1b60beb88639c70b8548ddc':
  Change the order of exposure compensation

11 years agoam 9fb962fe: Merge "Change the order of exposure compensation" into gb-ub-photos...
Doris Liu [Tue, 28 May 2013 17:45:17 +0000 (10:45 -0700)]
am 9fb962fe: Merge "Change the order of exposure compensation" into gb-ub-photos-bryce

* commit '9fb962feb94909af05ab6cf872eee7e8928eb9b1':
  Change the order of exposure compensation

11 years agoMerge "Change the order of exposure compensation" into gb-ub-photos-bryce
Doris Liu [Tue, 28 May 2013 17:43:38 +0000 (17:43 +0000)]
Merge "Change the order of exposure compensation" into gb-ub-photos-bryce

11 years agoam c1aaf4b5: am e3336dc3: Merge "Prevent lock screen appearing during active slidesho...
Bobby Georgescu [Tue, 28 May 2013 17:17:48 +0000 (10:17 -0700)]
am c1aaf4b5: am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce

* commit 'c1aaf4b526507245428ef56a03727a5d0fb68659':
  Prevent lock screen appearing during active slideshow

11 years agoam e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb...
Bobby Georgescu [Tue, 28 May 2013 17:15:02 +0000 (10:15 -0700)]
am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce

* commit 'e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e':
  Prevent lock screen appearing during active slideshow

11 years agoMerge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce
Bobby Georgescu [Tue, 28 May 2013 17:14:17 +0000 (17:14 +0000)]
Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Tue, 28 May 2013 14:37:41 +0000 (07:37 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: Ia6906f2a43e04fae3489cc3d253fa6bc5dc175f4

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 27 May 2013 19:25:22 +0000 (12:25 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iec953ffc39f8ad12f2f18a3fdee49046f4753839
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 27 May 2013 19:24:49 +0000 (12:24 -0700)]
Import translations. DO NOT MERGE

Change-Id: I122eede49de1a919508911c5439529fdda40b203
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 27 May 2013 19:24:15 +0000 (12:24 -0700)]
Import translations. DO NOT MERGE

Change-Id: I6d43e9331dd993de57921360e33c36a58c355056
Auto-generated-cl: translation import

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Sun, 26 May 2013 12:55:36 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoPrevent lock screen appearing during active slideshow
Bobby Georgescu [Fri, 24 May 2013 22:58:32 +0000 (15:58 -0700)]
Prevent lock screen appearing during active slideshow

Bug: 9094678
Change-Id: I8efb988911c75275430da934474df1e65265b234

11 years agoChange the order of exposure compensation
Doris Liu [Fri, 24 May 2013 22:58:18 +0000 (15:58 -0700)]
Change the order of exposure compensation

Bug: 9119379
Change-Id: I2e70ab1e83cf322ee0043850b2d27db962039bf3

11 years agoam 4f950b02: am c4edd18d: am 461e101f: Add 13MP resolution
Michael Kolb [Fri, 24 May 2013 20:02:15 +0000 (13:02 -0700)]
am 4f950b02: am c4edd18d: am 461e101f: Add 13MP resolution

* commit '4f950b02b321f6414dd9ad48b34560ee7f4e6b77':
  Add 13MP resolution

11 years agoam c4edd18d: am 461e101f: Add 13MP resolution
Michael Kolb [Fri, 24 May 2013 19:27:31 +0000 (12:27 -0700)]
am c4edd18d: am 461e101f: Add 13MP resolution

* commit 'c4edd18dcd6fa025a059b45e2f4c827569a24ac5':
  Add 13MP resolution

11 years agoam 461e101f: Add 13MP resolution
Michael Kolb [Fri, 24 May 2013 19:25:17 +0000 (12:25 -0700)]
am 461e101f: Add 13MP resolution

* commit '461e101fb99df1a704544efb29e56ece25788985':
  Add 13MP resolution

11 years agoAdd 13MP resolution
Michael Kolb [Fri, 24 May 2013 16:44:00 +0000 (09:44 -0700)]
Add 13MP resolution

  Bug: 9059351

Change-Id: I40c2c94ccc54399f6928d9e8a66abca0df15fea3

11 years agoam 0d2e0608: am 7b3d8d85: am a7a6a3a5: Fix issues with Local
John Hoford [Thu, 23 May 2013 15:58:01 +0000 (08:58 -0700)]
am 0d2e0608: am 7b3d8d85: am a7a6a3a5: Fix issues with Local

* commit '0d2e0608cce21d4d80d6b0270af71f86b150294f':
  Fix issues with Local

11 years agoam 7b3d8d85: am a7a6a3a5: Fix issues with Local
John Hoford [Thu, 23 May 2013 15:55:43 +0000 (08:55 -0700)]
am 7b3d8d85: am a7a6a3a5: Fix issues with Local

* commit '7b3d8d85e8602c0f6b43a13b3b0b1deccb8600cd':
  Fix issues with Local

11 years agoam a7a6a3a5: Fix issues with Local
John Hoford [Thu, 23 May 2013 15:53:55 +0000 (08:53 -0700)]
am a7a6a3a5: Fix issues with Local

* commit 'a7a6a3a5efaf62cdd5d562a9141678671952d27d':
  Fix issues with Local

11 years agoam edf16ad6: (-s ours) Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Thu, 23 May 2013 15:10:21 +0000 (08:10 -0700)]
am edf16ad6: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'edf16ad654cbebd53ef7be0c585e0f1937340f06':

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Thu, 23 May 2013 15:05:43 +0000 (08:05 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: I92222f8b210362d6a0bd2577216a5df5f822608a

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Thu, 23 May 2013 12:55:29 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoFix issues with Local
John Hoford [Wed, 22 May 2013 22:41:20 +0000 (15:41 -0700)]
Fix issues with Local

bug:9085638
Change-Id: I8d10373b4cd65b3f1338d88f1816ccb0b3a0166d

11 years agoam 4eb1825c: am 3d4fbf40: am 4d25d129: Merge "fix ellipse logic for portrait" into...
John Hoford [Wed, 22 May 2013 20:14:42 +0000 (13:14 -0700)]
am 4eb1825c: am 3d4fbf40: am 4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce

* commit '4eb1825cb6c305f1c4479f55fac9047a4001b8e4':
  fix ellipse logic for portrait

11 years agoam 3d4fbf40: am 4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos...
John Hoford [Wed, 22 May 2013 20:12:15 +0000 (13:12 -0700)]
am 3d4fbf40: am 4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce

* commit '3d4fbf40115389ed33487db2059048163c9afd1a':
  fix ellipse logic for portrait

11 years agoam 4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce
John Hoford [Wed, 22 May 2013 20:09:16 +0000 (13:09 -0700)]
am 4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce

* commit '4d25d129d1c9f92033382e12260d3f40521cf3fd':
  fix ellipse logic for portrait

11 years agoMerge "fix ellipse logic for portrait" into gb-ub-photos-bryce
John Hoford [Wed, 22 May 2013 20:08:26 +0000 (20:08 +0000)]
Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce

11 years agoam e3ea0548: am 410635e7: am cdc87e62: Merge "Fix potential synchronization issue...
Bobby Georgescu [Wed, 22 May 2013 18:19:09 +0000 (11:19 -0700)]
am e3ea0548: am 410635e7: am cdc87e62: Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce

* commit 'e3ea05489d870d9fb0c6c45401e01a07c7b90b4c':
  Fix potential synchronization issue in bitmap pool

11 years agoam 410635e7: am cdc87e62: Merge "Fix potential synchronization issue in bitmap pool...
Bobby Georgescu [Wed, 22 May 2013 18:16:48 +0000 (11:16 -0700)]
am 410635e7: am cdc87e62: Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce

* commit '410635e7f8df429fcecc328bf6191b053b989004':
  Fix potential synchronization issue in bitmap pool

11 years agoam cdc87e62: Merge "Fix potential synchronization issue in bitmap pool" into gb-ub...
Bobby Georgescu [Wed, 22 May 2013 18:12:39 +0000 (11:12 -0700)]
am cdc87e62: Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce

* commit 'cdc87e62ee28b5022b2e4d0bc756c264cc26d8e9':
  Fix potential synchronization issue in bitmap pool

11 years agoMerge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce
Bobby Georgescu [Wed, 22 May 2013 18:11:25 +0000 (18:11 +0000)]
Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce

11 years agoam dc5c77d6: am 02593125: am be4f113f: Fix editor on ICS
Michael Kolb [Wed, 22 May 2013 17:01:14 +0000 (10:01 -0700)]
am dc5c77d6: am 02593125: am be4f113f: Fix editor on ICS

* commit 'dc5c77d6e56171b7f879e9558e491f93b0def3a6':
  Fix editor on ICS

11 years agoam 02593125: am be4f113f: Fix editor on ICS
Michael Kolb [Wed, 22 May 2013 16:59:39 +0000 (09:59 -0700)]
am 02593125: am be4f113f: Fix editor on ICS

* commit '0259312504eddbae2f29a1d8a09892fb0e95d8c8':
  Fix editor on ICS

11 years agoam be4f113f: Fix editor on ICS
Michael Kolb [Wed, 22 May 2013 16:57:21 +0000 (09:57 -0700)]
am be4f113f: Fix editor on ICS

* commit 'be4f113fa1fea32e8d8865a52491b9f25760eaba':
  Fix editor on ICS

11 years agoFix editor on ICS
Michael Kolb [Wed, 22 May 2013 16:06:20 +0000 (09:06 -0700)]
Fix editor on ICS

  Bug: 9079902

Change-Id: I1159708b0a9db4a0369044cdf9f3620bca433e14

11 years agoam cac59514: (-s ours) Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Wed, 22 May 2013 14:27:41 +0000 (07:27 -0700)]
am cac59514: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'cac5951436f3cff8b0e634b52633b193e139c135':

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Wed, 22 May 2013 14:23:04 +0000 (07:23 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: I7100dae7ada8486be79bec2166bf9b8f81cf9e34

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Wed, 22 May 2013 12:55:31 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agofix ellipse logic for portrait
John Hoford [Wed, 22 May 2013 00:11:05 +0000 (17:11 -0700)]
fix ellipse logic for portrait

bug:9054114
Change-Id: I4bdc7301a60e74bf663fda031c0f2c76ee34b7ec

11 years agoam 28d3467e: am 7da344a4: am 37be6658: Merge "Fix selection highlight for tablets...
Michael Kolb [Tue, 21 May 2013 23:17:31 +0000 (16:17 -0700)]
am 28d3467e: am 7da344a4: am 37be6658: Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce

* commit '28d3467e5dbad9e21e7a7695a15faedea5e9c8ef':
  Fix selection highlight for tablets

11 years agoam 7da344a4: am 37be6658: Merge "Fix selection highlight for tablets" into gb-ub...
Michael Kolb [Tue, 21 May 2013 23:12:27 +0000 (16:12 -0700)]
am 7da344a4: am 37be6658: Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce

* commit '7da344a46f348a5bc9ac958ccf7186b4f7d1c899':
  Fix selection highlight for tablets

11 years agoam 37be6658: Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce
Michael Kolb [Tue, 21 May 2013 23:10:57 +0000 (16:10 -0700)]
am 37be6658: Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce

* commit '37be6658075cac2bad0e30d93705dddeaaf1e421':
  Fix selection highlight for tablets

11 years agoMerge "Fix selection highlight for tablets" into gb-ub-photos-bryce
Michael Kolb [Tue, 21 May 2013 23:09:18 +0000 (23:09 +0000)]
Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce

11 years agoam a4a09f9c: am 550eefae: am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryce
John Reck [Tue, 21 May 2013 23:04:09 +0000 (16:04 -0700)]
am a4a09f9c: am 550eefae: am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryce

* commit 'a4a09f9c0d73876a92c4fddbbd5086fa21899af2':
  Fix height

11 years agoam 550eefae: am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryce
John Reck [Tue, 21 May 2013 23:01:26 +0000 (16:01 -0700)]
am 550eefae: am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryce

* commit '550eefae642049dea0023168643b54d1c7a73b8e':
  Fix height

11 years agoam 01ae91aa: Merge "Fix height" into gb-ub-photos-bryce
John Reck [Tue, 21 May 2013 22:57:48 +0000 (15:57 -0700)]
am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryce

* commit '01ae91aa0e347c5a8b335afc8cb0f02459ee5adc':
  Fix height

11 years agoMerge "Fix height" into gb-ub-photos-bryce
John Reck [Tue, 21 May 2013 22:55:16 +0000 (22:55 +0000)]
Merge "Fix height" into gb-ub-photos-bryce

11 years agoam 103b2429: am 0cf42d07: am 80a3d636: Make capture thumbnail tappable in video mode.
Sascha Haeberling [Tue, 21 May 2013 22:48:00 +0000 (15:48 -0700)]
am 103b2429: am 0cf42d07: am 80a3d636: Make capture thumbnail tappable in video mode.

* commit '103b2429c1840ed85dddef636bc7c6ffd03deea2':
  Make capture thumbnail tappable in video mode.

11 years agoam 0cf42d07: am 80a3d636: Make capture thumbnail tappable in video mode.
Sascha Haeberling [Tue, 21 May 2013 22:46:14 +0000 (15:46 -0700)]
am 0cf42d07: am 80a3d636: Make capture thumbnail tappable in video mode.

* commit '0cf42d07132b27aa1f50707fbf5aa30fde925cbf':
  Make capture thumbnail tappable in video mode.

11 years agoam 80a3d636: Make capture thumbnail tappable in video mode.
Sascha Haeberling [Tue, 21 May 2013 22:43:32 +0000 (15:43 -0700)]
am 80a3d636: Make capture thumbnail tappable in video mode.

* commit '80a3d636fa38bb78dbc9f224b4944a21a6e3271d':
  Make capture thumbnail tappable in video mode.