OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam b514ae67: am 80b49106: am 351f96ee: am c59be382: Added check to strip out uninitia...
Ruben Brunk [Fri, 5 Apr 2013 23:57:52 +0000 (16:57 -0700)]
am b514ae67: am 80b49106: am 351f96ee: am c59be382: Added check to strip out uninitialized EXIF tags.

* commit 'b514ae67360c7c33656767a1c28240c316108df3':
  Added check to strip out uninitialized EXIF tags.

11 years agoam 80b49106: am 351f96ee: am c59be382: Added check to strip out uninitialized EXIF...
Ruben Brunk [Fri, 5 Apr 2013 23:54:22 +0000 (16:54 -0700)]
am 80b49106: am 351f96ee: am c59be382: Added check to strip out uninitialized EXIF tags.

* commit '80b491062306ab817a63cb0f195fa00ae0c74fb5':
  Added check to strip out uninitialized EXIF tags.

11 years agoam 351f96ee: am c59be382: Added check to strip out uninitialized EXIF tags.
Ruben Brunk [Fri, 5 Apr 2013 23:48:39 +0000 (16:48 -0700)]
am 351f96ee: am c59be382: Added check to strip out uninitialized EXIF tags.

* commit '351f96eeacc4342385ee2d215af1322ac079cfdc':
  Added check to strip out uninitialized EXIF tags.

11 years agoam c59be382: Added check to strip out uninitialized EXIF tags.
Ruben Brunk [Fri, 5 Apr 2013 23:44:56 +0000 (16:44 -0700)]
am c59be382: Added check to strip out uninitialized EXIF tags.

* commit 'c59be38287ed3d58f6945d63713b03ac20510c22':
  Added check to strip out uninitialized EXIF tags.

11 years agoAdded check to strip out uninitialized EXIF tags.
Ruben Brunk [Fri, 5 Apr 2013 23:22:55 +0000 (16:22 -0700)]
Added check to strip out uninitialized EXIF tags.

Bug: 8552339
Change-Id: Ib6ae4f59f9e393e5f6b46877a4b2c3b2fe1852d3

11 years agoam 526bcbb1: (-s ours) am b0cf2dcd: am 20b837a9: am f9ee06b2: (-s ours) Merge "Import...
Baligh Uddin [Fri, 5 Apr 2013 19:15:54 +0000 (12:15 -0700)]
am 526bcbb1: (-s ours) am b0cf2dcd: am 20b837a9: am f9ee06b2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '526bcbb1699dc08962e39aeee2129a085c1c028a':
  Import translations. DO NOT MERGE

11 years agoam 1f7a915f: (-s ours) am fd8906a0: am 88154ff2: Merge "Import translations. DO NOT...
Baligh Uddin [Fri, 5 Apr 2013 19:15:53 +0000 (12:15 -0700)]
am 1f7a915f: (-s ours) am fd8906a0: am 88154ff2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '1f7a915fa18fe2708fc80bc33ad4fad2361d2f91':
  Import translations. DO NOT MERGE

11 years agoam b0cf2dcd: am 20b837a9: am f9ee06b2: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Fri, 5 Apr 2013 19:12:33 +0000 (12:12 -0700)]
am b0cf2dcd: am 20b837a9: am f9ee06b2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoam fd8906a0: am 88154ff2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 5 Apr 2013 19:12:32 +0000 (12:12 -0700)]
am fd8906a0: am 88154ff2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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

11 years agoam 20b837a9: am f9ee06b2: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Fri, 5 Apr 2013 19:09:01 +0000 (12:09 -0700)]
am 20b837a9: am f9ee06b2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '20b837a995a150ec4024324dd1b6874ff4f9113f':
  Import translations. DO NOT MERGE

11 years agoam 88154ff2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 5 Apr 2013 19:09:00 +0000 (12:09 -0700)]
am 88154ff2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '88154ff2a4c440732aafdc80776e41affe9d8980':
  Import translations. DO NOT MERGE

11 years agoam 3f935e73: (-s ours) Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 5 Apr 2013 19:07:31 +0000 (12:07 -0700)]
am 3f935e73: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '3f935e7300a2873c777fecbb6b41467bde0312dc':
  Import translations. DO NOT MERGE

11 years agoam f9ee06b2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 5 Apr 2013 19:07:13 +0000 (12:07 -0700)]
am f9ee06b2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoMerge "Import translations. DO NOT MERGE" into master-security-dev
Baligh Uddin [Fri, 5 Apr 2013 19:02:44 +0000 (19:02 +0000)]
Merge "Import translations. DO NOT MERGE" into master-security-dev

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 5 Apr 2013 19:02:34 +0000 (19:02 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 5 Apr 2013 19:02:23 +0000 (19:02 +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, 5 Apr 2013 19:02:11 +0000 (19:02 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Apr 2013 18:35:23 +0000 (11:35 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Apr 2013 18:35:02 +0000 (11:35 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Apr 2013 18:34:40 +0000 (11:34 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Apr 2013 18:34:17 +0000 (11:34 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 2ced1901: am 47811c4c: am b94167bd: am 5e1e5a5e: Merge "Don\'t add unsupported...
Michael Kolb [Fri, 5 Apr 2013 17:21:26 +0000 (10:21 -0700)]
am 2ced1901: am 47811c4c: am b94167bd: am 5e1e5a5e: Merge "Don\'t add unsupported options to menu" into gb-ub-photos-bryce

* commit '2ced19010889e957d16fe243368f7a3f6d4cddad':
  Don't add unsupported options to menu

11 years agoam 47811c4c: am b94167bd: am 5e1e5a5e: Merge "Don\'t add unsupported options to menu...
Michael Kolb [Fri, 5 Apr 2013 17:17:06 +0000 (10:17 -0700)]
am 47811c4c: am b94167bd: am 5e1e5a5e: Merge "Don\'t add unsupported options to menu" into gb-ub-photos-bryce

* commit '47811c4c307de0bbcabb08c0052ff4320f3bcc3e':
  Don't add unsupported options to menu

11 years agoam b94167bd: am 5e1e5a5e: Merge "Don\'t add unsupported options to menu" into gb...
Michael Kolb [Fri, 5 Apr 2013 17:14:50 +0000 (10:14 -0700)]
am b94167bd: am 5e1e5a5e: Merge "Don\'t add unsupported options to menu" into gb-ub-photos-bryce

* commit 'b94167bd52a343d0c74a3b8bc0523f1747490a7e':
  Don't add unsupported options to menu

11 years agoam 5e1e5a5e: Merge "Don\'t add unsupported options to menu" into gb-ub-photos-bryce
Michael Kolb [Fri, 5 Apr 2013 17:11:41 +0000 (10:11 -0700)]
am 5e1e5a5e: Merge "Don\'t add unsupported options to menu" into gb-ub-photos-bryce

* commit '5e1e5a5e301491249d24c9f3a4d1014d07e72985':
  Don't add unsupported options to menu

11 years agoMerge "Don't add unsupported options to menu" into gb-ub-photos-bryce
Michael Kolb [Fri, 5 Apr 2013 17:08:40 +0000 (17:08 +0000)]
Merge "Don't add unsupported options to menu" into gb-ub-photos-bryce

11 years agoDon't add unsupported options to menu
Michael Kolb [Fri, 5 Apr 2013 16:52:55 +0000 (09:52 -0700)]
Don't add unsupported options to menu

  Bug: 8549712

Exposure compensation and whitebalance were not checked when added
to the menu.

Change-Id: I90e2baea25e0273ed96e3678b3ed4c99184475df

11 years agoam fec8429c: am c8216ed7: am e9ba7351: am 214f7869: Merge "Remove redudant setName...
ztenghui [Thu, 4 Apr 2013 23:15:57 +0000 (16:15 -0700)]
am fec8429c: am c8216ed7: am e9ba7351: am 214f7869: Merge "Remove redudant setName" into gb-ub-photos-bryce

* commit 'fec8429c804a76385defc0eb3b8109a62086ff6f':
  Remove redudant setName

11 years agoam 3cd0916b: am 662f5176: am 5e575401: am 4f58f875: Bump up the version number to...
Bart Sears [Thu, 4 Apr 2013 23:15:57 +0000 (16:15 -0700)]
am 3cd0916b: am 662f5176: am 5e575401: am 4f58f875: Bump up the version number to 1.1.40007

* commit '3cd0916b4777f3876f7e8fb546d58a966d56afce':
  Bump up the version number to 1.1.40007

11 years agoam c8216ed7: am e9ba7351: am 214f7869: Merge "Remove redudant setName" into gb-ub...
ztenghui [Thu, 4 Apr 2013 23:09:03 +0000 (16:09 -0700)]
am c8216ed7: am e9ba7351: am 214f7869: Merge "Remove redudant setName" into gb-ub-photos-bryce

* commit 'c8216ed74ea214eb4fd0b10c308ace60cc003eeb':
  Remove redudant setName

11 years agoam 662f5176: am 5e575401: am 4f58f875: Bump up the version number to 1.1.40007
Bart Sears [Thu, 4 Apr 2013 23:09:02 +0000 (16:09 -0700)]
am 662f5176: am 5e575401: am 4f58f875: Bump up the version number to 1.1.40007

* commit '662f5176f328be4379b42078de25866f5c8c47e1':
  Bump up the version number to 1.1.40007

11 years agoam e9ba7351: am 214f7869: Merge "Remove redudant setName" into gb-ub-photos-bryce
ztenghui [Thu, 4 Apr 2013 23:05:30 +0000 (16:05 -0700)]
am e9ba7351: am 214f7869: Merge "Remove redudant setName" into gb-ub-photos-bryce

* commit 'e9ba7351f6598ec950c6df007448567dcaa555b6':
  Remove redudant setName

11 years agoam 5e575401: am 4f58f875: Bump up the version number to 1.1.40007
Bart Sears [Thu, 4 Apr 2013 23:05:29 +0000 (16:05 -0700)]
am 5e575401: am 4f58f875: Bump up the version number to 1.1.40007

* commit '5e575401757d93c4d18ba40f05d146bbdf6e9e6f':
  Bump up the version number to 1.1.40007

11 years agoam 214f7869: Merge "Remove redudant setName" into gb-ub-photos-bryce
ztenghui [Thu, 4 Apr 2013 23:00:59 +0000 (16:00 -0700)]
am 214f7869: Merge "Remove redudant setName" into gb-ub-photos-bryce

* commit '214f786938fd0924ec89190b5f38d034f0be7291':
  Remove redudant setName

11 years agoam 4f58f875: Bump up the version number to 1.1.40007
Bart Sears [Thu, 4 Apr 2013 23:00:58 +0000 (16:00 -0700)]
am 4f58f875: Bump up the version number to 1.1.40007

* commit '4f58f87598044f3742d6faaf1ac8ff777c7dcffc':
  Bump up the version number to 1.1.40007

11 years agoMerge "Remove redudant setName" into gb-ub-photos-bryce
ztenghui [Thu, 4 Apr 2013 22:57:41 +0000 (22:57 +0000)]
Merge "Remove redudant setName" into gb-ub-photos-bryce

11 years agoBump up the version number to 1.1.40007
Bart Sears [Thu, 4 Apr 2013 22:07:12 +0000 (15:07 -0700)]
Bump up the version number to 1.1.40007

Change-Id: Ia494e2c210f642ec0232394d0cfabaf5e1b8f96a

11 years agoRemove redudant setName
ztenghui [Thu, 4 Apr 2013 17:28:43 +0000 (10:28 -0700)]
Remove redudant setName

Change-Id: Id9c5f2ee268b275ba4272f66a0f72c1aa4786f9c

11 years agoam d74129bf: am cecc50f5: am e65a9f48: am 3b763852: Merge "fixed the value that quali...
John Hoford [Thu, 4 Apr 2013 15:56:59 +0000 (08:56 -0700)]
am d74129bf: am cecc50f5: am e65a9f48: am 3b763852: Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce

* commit 'd74129bf2d0796b3c6e1d273243ef63c916d8f6d':
  fixed the value that quality was getting set to

11 years agoam cecc50f5: am e65a9f48: am 3b763852: Merge "fixed the value that quality was gettin...
John Hoford [Thu, 4 Apr 2013 15:53:52 +0000 (08:53 -0700)]
am cecc50f5: am e65a9f48: am 3b763852: Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce

* commit 'cecc50f599ddef3cc8db7552354f40c5b2a9887b':
  fixed the value that quality was getting set to

11 years agoam e65a9f48: am 3b763852: Merge "fixed the value that quality was getting set to...
John Hoford [Thu, 4 Apr 2013 15:50:24 +0000 (08:50 -0700)]
am e65a9f48: am 3b763852: Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce

* commit 'e65a9f48a545f6ed2043e89cbe6637aeadf6c30a':
  fixed the value that quality was getting set to

11 years agoam 3b763852: Merge "fixed the value that quality was getting set to" into gb-ub-photo...
John Hoford [Thu, 4 Apr 2013 15:46:22 +0000 (08:46 -0700)]
am 3b763852: Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce

* commit '3b7638527bf8f472bedf99ed412d692e4031d03e':
  fixed the value that quality was getting set to

11 years agoMerge "fixed the value that quality was getting set to" into gb-ub-photos-bryce
John Hoford [Thu, 4 Apr 2013 15:42:50 +0000 (15:42 +0000)]
Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce

11 years agoam f7ea34e6: (-s ours) am 1a37c1b0: Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Thu, 4 Apr 2013 01:10:13 +0000 (18:10 -0700)]
am f7ea34e6: (-s ours) am 1a37c1b0: Reconcile with jb-mr2-release - do not merge

* commit 'f7ea34e6da6f361c995663ff378f490f8d3edcd5':
  am 2b246048: Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce
  am 0e018f44: Merge "Make stopPreview synchronous." into gb-ub-photos-bryce

11 years agoam 1a37c1b0: Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Thu, 4 Apr 2013 01:05:27 +0000 (18:05 -0700)]
am 1a37c1b0: Reconcile with jb-mr2-release - do not merge

* commit '1a37c1b012e4c38cafa1c4e945cd8cd690e7e105':
  am 2b246048: Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce
  am 0e018f44: Merge "Make stopPreview synchronous." into gb-ub-photos-bryce

11 years agofixed the value that quality was getting set to
John Hoford [Wed, 3 Apr 2013 23:53:04 +0000 (16:53 -0700)]
fixed the value that quality was getting set to

Change-Id: I493c37c065e180ed3a7a785df4132812bd53add4

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Wed, 3 Apr 2013 23:43:37 +0000 (16:43 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: I666a136b9a745370acd7ed37cb78c19939d6ac00

11 years agoam 8285f913: am 20462495: am 00d755f4: am 56b8463a: Merge "Adjust camera menu further...
Michael Kolb [Wed, 3 Apr 2013 23:22:48 +0000 (16:22 -0700)]
am 8285f913: am 20462495: am 00d755f4: am 56b8463a: Merge "Adjust camera menu further" into gb-ub-photos-bryce

* commit '8285f913dfda1beca42612be2bd2bbfff516fa99':
  Adjust camera menu further

11 years agoam 20462495: am 00d755f4: am 56b8463a: Merge "Adjust camera menu further" into gb...
Michael Kolb [Wed, 3 Apr 2013 23:19:34 +0000 (16:19 -0700)]
am 20462495: am 00d755f4: am 56b8463a: Merge "Adjust camera menu further" into gb-ub-photos-bryce

* commit '2046249565caca3df9806e5ebdddafb328535608':
  Adjust camera menu further

11 years agoam 00d755f4: am 56b8463a: Merge "Adjust camera menu further" into gb-ub-photos-bryce
Michael Kolb [Wed, 3 Apr 2013 23:16:33 +0000 (16:16 -0700)]
am 00d755f4: am 56b8463a: Merge "Adjust camera menu further" into gb-ub-photos-bryce

* commit '00d755f4bdd39307ffb9e9372393047cb7c97e0a':
  Adjust camera menu further

11 years agoam a405630b: am fe8a8a7b: am 6db9f6ff: am a2dcdfe3: Merge "Don\'t access mParameters...
Angus Kong [Wed, 3 Apr 2013 23:12:47 +0000 (16:12 -0700)]
am a405630b: am fe8a8a7b: am 6db9f6ff: am a2dcdfe3: Merge "Don\'t access mParameters dirty bit in other thread" into gb-ub-photos-bryce

* commit 'a405630b6607990e3a2f5ee352923ffc8c976383':
  Don't access mParameters dirty bit in other thread

11 years agoam 56b8463a: Merge "Adjust camera menu further" into gb-ub-photos-bryce
Michael Kolb [Wed, 3 Apr 2013 23:12:14 +0000 (16:12 -0700)]
am 56b8463a: Merge "Adjust camera menu further" into gb-ub-photos-bryce

* commit '56b8463ae34900368f735d9ba75ac39d635ad7cc':
  Adjust camera menu further

11 years agoMerge "Adjust camera menu further" into gb-ub-photos-bryce
Michael Kolb [Wed, 3 Apr 2013 23:09:48 +0000 (23:09 +0000)]
Merge "Adjust camera menu further" into gb-ub-photos-bryce

11 years agoam fe8a8a7b: am 6db9f6ff: am a2dcdfe3: Merge "Don\'t access mParameters dirty bit...
Angus Kong [Wed, 3 Apr 2013 23:07:08 +0000 (16:07 -0700)]
am fe8a8a7b: am 6db9f6ff: am a2dcdfe3: Merge "Don\'t access mParameters dirty bit in other thread" into gb-ub-photos-bryce

* commit 'fe8a8a7bff1956d30ab3b421aa44ed194ae4886c':
  Don't access mParameters dirty bit in other thread

11 years agoam 6db9f6ff: am a2dcdfe3: Merge "Don\'t access mParameters dirty bit in other thread...
Angus Kong [Wed, 3 Apr 2013 22:46:44 +0000 (15:46 -0700)]
am 6db9f6ff: am a2dcdfe3: Merge "Don\'t access mParameters dirty bit in other thread" into gb-ub-photos-bryce

* commit '6db9f6ff79c991ade56e226ecc24bd5b14d132cc':
  Don't access mParameters dirty bit in other thread

11 years agoam a2dcdfe3: Merge "Don\'t access mParameters dirty bit in other thread" into gb...
Angus Kong [Wed, 3 Apr 2013 22:45:03 +0000 (15:45 -0700)]
am a2dcdfe3: Merge "Don\'t access mParameters dirty bit in other thread" into gb-ub-photos-bryce

* commit 'a2dcdfe34f634cc07acfcf92d8829a0373cec969':
  Don't access mParameters dirty bit in other thread

11 years agoMerge "Don't access mParameters dirty bit in other thread" into gb-ub-photos-bryce
Angus Kong [Wed, 3 Apr 2013 22:41:53 +0000 (22:41 +0000)]
Merge "Don't access mParameters dirty bit in other thread" into gb-ub-photos-bryce

11 years agoAdjust camera menu further
Michael Kolb [Tue, 2 Apr 2013 23:03:04 +0000 (16:03 -0700)]
Adjust camera menu further

Change-Id: I7e062608a7ee8e16932209640bd50b1864336a40

11 years agoam c88842c5: (-s ours) am f99b3c68: am e9364e70: am e4ec8797: (-s ours) Merge "Import...
Baligh Uddin [Wed, 3 Apr 2013 22:14:25 +0000 (15:14 -0700)]
am c88842c5: (-s ours) am f99b3c68: am e9364e70: am e4ec8797: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoam 0ccc8645: (-s ours) am 5fde40c5: am 3c2780c1: Merge "Import translations. DO NOT...
Baligh Uddin [Wed, 3 Apr 2013 22:14:24 +0000 (15:14 -0700)]
am 0ccc8645: (-s ours) am 5fde40c5: am 3c2780c1: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '0ccc8645923ec7ac05ef65772cd065f3c51d43b0':
  Import translations. DO NOT MERGE

11 years agoam 5d9bf932: (-s ours) am e80d06c6: am 5fdb5643: am 7f1ca673: (-s ours) Merge "Import...
Baligh Uddin [Wed, 3 Apr 2013 22:14:24 +0000 (15:14 -0700)]
am 5d9bf932: (-s ours) am e80d06c6: am 5fdb5643: am 7f1ca673: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '5d9bf93261eb4f4c6395ffad5f8fa3581a3508cd':
  Import translations. DO NOT MERGE

11 years agoam 17413ac4: (-s ours) am a46448ef: am 1573bd48: Merge "Import translations. DO NOT...
Baligh Uddin [Wed, 3 Apr 2013 22:14:23 +0000 (15:14 -0700)]
am 17413ac4: (-s ours) am a46448ef: am 1573bd48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '17413ac40a5ab2845d47e83cc3fd359c987dde20':
  Import translations. DO NOT MERGE

11 years agoam f99b3c68: am e9364e70: am e4ec8797: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Wed, 3 Apr 2013 22:08:31 +0000 (15:08 -0700)]
am f99b3c68: am e9364e70: am e4ec8797: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoam 5fde40c5: am 3c2780c1: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 3 Apr 2013 22:08:30 +0000 (15:08 -0700)]
am 5fde40c5: am 3c2780c1: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '5fde40c5968c7fc14149366dbea6641e6215fcdb':
  Import translations. DO NOT MERGE

11 years agoam e80d06c6: am 5fdb5643: am 7f1ca673: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Wed, 3 Apr 2013 22:08:23 +0000 (15:08 -0700)]
am e80d06c6: am 5fdb5643: am 7f1ca673: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoam a46448ef: am 1573bd48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 3 Apr 2013 22:08:22 +0000 (15:08 -0700)]
am a46448ef: am 1573bd48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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

11 years agoam e9364e70: am e4ec8797: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Wed, 3 Apr 2013 22:06:23 +0000 (15:06 -0700)]
am e9364e70: am e4ec8797: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoam 3c2780c1: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 3 Apr 2013 22:06:23 +0000 (15:06 -0700)]
am 3c2780c1: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '3c2780c1cb4472a0ba62b3d913c8d06055a82e00':
  Import translations. DO NOT MERGE

11 years agoam 9aef2ffa: (-s ours) Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 3 Apr 2013 22:05:03 +0000 (15:05 -0700)]
am 9aef2ffa: (-s ours) Merge "Import translations. DO NOT MERGE"

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

11 years agoam 5fdb5643: am 7f1ca673: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Wed, 3 Apr 2013 22:02:43 +0000 (15:02 -0700)]
am 5fdb5643: am 7f1ca673: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '5fdb564375b04761aea41b47b0f1da8e6299a40a':
  Import translations. DO NOT MERGE

11 years agoam 1573bd48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 3 Apr 2013 22:02:42 +0000 (15:02 -0700)]
am 1573bd48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '1573bd489792795983639ccbdb8a88dae3c34d68':
  Import translations. DO NOT MERGE

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

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

11 years agoam 1c2dc64d: (-s ours) Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 3 Apr 2013 22:01:35 +0000 (15:01 -0700)]
am 1c2dc64d: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '1c2dc64d4985ac1ab40bf15f5938b64c3a04ba2f':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into master-security-dev
Baligh Uddin [Wed, 3 Apr 2013 22:01:04 +0000 (22:01 +0000)]
Merge "Import translations. DO NOT MERGE" into master-security-dev

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 3 Apr 2013 22:00:51 +0000 (22:00 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 3 Apr 2013 22:00:41 +0000 (22:00 +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, 3 Apr 2013 21:58:43 +0000 (21:58 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoam 7f1ca673: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 3 Apr 2013 21:58:38 +0000 (14:58 -0700)]
am 7f1ca673: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '7f1ca673ab787c916c07f35ad3a5c868eb700ada':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into master-security-dev
Baligh Uddin [Wed, 3 Apr 2013 21:58:29 +0000 (21:58 +0000)]
Merge "Import translations. DO NOT MERGE" into master-security-dev

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 3 Apr 2013 21:58:18 +0000 (21:58 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 3 Apr 2013 21:57:29 +0000 (21:57 +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, 3 Apr 2013 21:56:08 +0000 (21:56 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoam 0a44543f: am cd1b8043: am d922866f: am 048a61c7: Improve black bar to keep camera...
Doris Liu [Wed, 3 Apr 2013 21:20:55 +0000 (14:20 -0700)]
am 0a44543f: am cd1b8043: am d922866f: am 048a61c7: Improve black bar to keep camera controls in place

* commit '0a44543fca1eb4d144bfb503f53608aadf087384':
  Improve black bar to keep camera controls in place

11 years agoam cd1b8043: am d922866f: am 048a61c7: Improve black bar to keep camera controls...
Doris Liu [Wed, 3 Apr 2013 21:16:36 +0000 (14:16 -0700)]
am cd1b8043: am d922866f: am 048a61c7: Improve black bar to keep camera controls in place

* commit 'cd1b804318e5de51cbb182ab52ca1202c5143349':
  Improve black bar to keep camera controls in place

11 years agoam d922866f: am 048a61c7: Improve black bar to keep camera controls in place
Doris Liu [Wed, 3 Apr 2013 21:11:29 +0000 (14:11 -0700)]
am d922866f: am 048a61c7: Improve black bar to keep camera controls in place

* commit 'd922866fa47d55a64bc63ec0b292897046065c33':
  Improve black bar to keep camera controls in place

11 years agoam 048a61c7: Improve black bar to keep camera controls in place
Doris Liu [Wed, 3 Apr 2013 21:09:08 +0000 (14:09 -0700)]
am 048a61c7: Improve black bar to keep camera controls in place

* commit '048a61c7ab3f63688faeb39c253251e58f30c5f8':
  Improve black bar to keep camera controls in place

11 years agoam bca2cdd5: am a417518f: am 48f8d515: am 8ce4df01: fix touch action in draw
John Hoford [Wed, 3 Apr 2013 20:49:07 +0000 (13:49 -0700)]
am bca2cdd5: am a417518f: am 48f8d515: am 8ce4df01: fix touch action in draw

* commit 'bca2cdd51480c76e6f63bfd22bff5e5f7ce5ef06':
  fix touch action in draw

11 years agoImprove black bar to keep camera controls in place
Doris Liu [Wed, 3 Apr 2013 00:48:56 +0000 (17:48 -0700)]
Improve black bar to keep camera controls in place

Bug: 8340996

Change-Id: Ibca4a9f1ed84bd59e29cc988df346f1567de2a5b

11 years agoam a417518f: am 48f8d515: am 8ce4df01: fix touch action in draw
John Hoford [Wed, 3 Apr 2013 19:44:48 +0000 (12:44 -0700)]
am a417518f: am 48f8d515: am 8ce4df01: fix touch action in draw

* commit 'a417518fc9a3c8c7c551cb57fce9dda5dca539b9':
  fix touch action in draw

11 years agoam 48f8d515: am 8ce4df01: fix touch action in draw
John Hoford [Wed, 3 Apr 2013 19:39:53 +0000 (12:39 -0700)]
am 48f8d515: am 8ce4df01: fix touch action in draw

* commit '48f8d51527ecfeab71c0d23c9642b3c1d9059a5f':
  fix touch action in draw

11 years agoam 8ce4df01: fix touch action in draw
John Hoford [Wed, 3 Apr 2013 19:34:29 +0000 (12:34 -0700)]
am 8ce4df01: fix touch action in draw

* commit '8ce4df0105e645aed8503c3f03c98c208621911d':
  fix touch action in draw

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 18:41:05 +0000 (11:41 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 18:40:45 +0000 (11:40 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 18:40:22 +0000 (11:40 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 18:39:53 +0000 (11:39 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 18:39:27 +0000 (11:39 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 18:38:48 +0000 (11:38 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 18:38:16 +0000 (11:38 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 18:37:40 +0000 (11:37 -0700)]
Import translations. DO NOT MERGE

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

11 years agofix touch action in draw
John Hoford [Wed, 3 Apr 2013 17:58:40 +0000 (10:58 -0700)]
fix touch action in draw

Change-Id: I8c1e040a795186c47c8319441ed1c371497a5f6d