git.osdn.net Git - android-x86/packages-apps-Camera2.git/log

Baligh Uddin [Fri, 15 Aug 2014 22:35:59 +0000 (22:35 +0000)]

am 69853a4e: (-s ours) Import translations. DO NOT MERGE

* commit '69853a4e0e38fd3a193ea872beb496a090de8364':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 15 Aug 2014 21:33:58 +0000 (14:33 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 21:30:21 +0000 (21:30 +0000)]

am a833093a: (-s ours) am 8b602ee0: (-s ours) am cc3796fa: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 21:23:55 +0000 (21:23 +0000)]

am 8b602ee0: (-s ours) am cc3796fa: (-s ours) Import translations. DO NOT MERGE

* commit '8b602ee06eb668246fb43be849e6e4b047707253':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 21:22:52 +0000 (21:22 +0000)]

am cd89e549: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 21:22:52 +0000 (21:22 +0000)]

am 23d07fed: (-s ours) Import translations. DO NOT MERGE

* commit '23d07fedc57934972132598b1c84a8668256d1b9':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 21:21:11 +0000 (21:21 +0000)]

am cc3796fa: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 14:02:02 +0000 (07:02 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 14:01:30 +0000 (07:01 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Wed, 25 Jun 2014 17:59:10 +0000 (10:59 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Thu, 22 May 2014 03:15:36 +0000 (03:15 +0000)]

am e8fa640f: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Wed, 21 May 2014 22:06:57 +0000 (15:06 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Wed, 30 Apr 2014 00:49:54 +0000 (00:49 +0000)]

am ece4866d: Merge commit \'f9525d410de0b840f0da5a8659734f91a66f8ed2\' into HEAD

* commit 'ece4866dc575b956801f6dab2d6c4923e272c5fa':

commit | commitdiff | tree

Bill Yi [Tue, 29 Apr 2014 18:34:24 +0000 (11:34 -0700)]

Merge commit 'f9525d410de0b840f0da5a8659734f91a66f8ed2' into HEAD

commit | commitdiff | tree

Baligh Uddin [Wed, 23 Apr 2014 02:13:24 +0000 (02:13 +0000)]

am d2f894e1: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Wed, 23 Apr 2014 01:08:46 +0000 (18:08 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Ying Wang [Sat, 19 Apr 2014 00:05:15 +0000 (00:05 +0000)]

am c71e0154: Merge "LOCAL_JNI_SHARED_LIBRARIES now works for both bundled and unbundled build."

* commit 'c71e0154334ae6ebf561a483fbf0bae8ad08d5c5':
LOCAL_JNI_SHARED_LIBRARIES now works for both bundled and unbundled build.

commit | commitdiff | tree

Ying Wang [Fri, 18 Apr 2014 23:56:04 +0000 (23:56 +0000)]

Merge "LOCAL_JNI_SHARED_LIBRARIES now works for both bundled and unbundled build."

commit | commitdiff | tree

Ying Wang [Fri, 18 Apr 2014 01:26:00 +0000 (18:26 -0700)]

LOCAL_JNI_SHARED_LIBRARIES now works for both bundled and unbundled build.

Change-Id: If21a4f5ddab6ae9ecb37f6e7ebebef411028b2ef

commit | commitdiff | tree

Narayan Kamath [Wed, 9 Apr 2014 14:19:43 +0000 (14:19 +0000)]

am b102c508: Merge "Fix build dependencies"

* commit 'b102c5089dffd5d81394788560c69c7c743d86a5':
Fix build dependencies

commit | commitdiff | tree

Narayan Kamath [Wed, 9 Apr 2014 14:12:47 +0000 (14:12 +0000)]

Merge "Fix build dependencies"

commit | commitdiff | tree

Erin Dahlgren [Wed, 2 Apr 2014 17:10:22 +0000 (17:10 +0000)]

am 0599fed5: am cd6dac16: am 1002a5fc: am 7abd26bb: Add CameraPerformanceTracker to Carlsbad to make future comparisons easy.

* commit '0599fed50abeb080f14f19811ade12f55d0b13c6':
Add CameraPerformanceTracker to Carlsbad to make future comparisons easy.

commit | commitdiff | tree

Erin Dahlgren [Wed, 2 Apr 2014 17:02:56 +0000 (17:02 +0000)]

am cd6dac16: am 1002a5fc: am 7abd26bb: Add CameraPerformanceTracker to Carlsbad to make future comparisons easy.

* commit 'cd6dac164505230324eaa7d8df2687ef1bebae12':
Add CameraPerformanceTracker to Carlsbad to make future comparisons easy.

commit | commitdiff | tree

Erin Dahlgren [Wed, 2 Apr 2014 16:59:59 +0000 (16:59 +0000)]

am 1002a5fc: am 7abd26bb: Add CameraPerformanceTracker to Carlsbad to make future comparisons easy.

* commit '1002a5fcffa2fd06aea1b0ef67ea0e077609e28f':
Add CameraPerformanceTracker to Carlsbad to make future comparisons easy.

commit | commitdiff | tree

Erin Dahlgren [Wed, 2 Apr 2014 16:56:46 +0000 (16:56 +0000)]

am 7abd26bb: Add CameraPerformanceTracker to Carlsbad to make future comparisons easy.

* commit '7abd26bbcf361db8738d020f8880ec541a9e4ecb':
Add CameraPerformanceTracker to Carlsbad to make future comparisons easy.

commit | commitdiff | tree

Erin Dahlgren [Tue, 1 Apr 2014 18:49:18 +0000 (11:49 -0700)]

Add CameraPerformanceTracker to Carlsbad to make future comparisons easy.

Bug: 11376004
Change-Id: Ief4d47dd21bb23826c076e91ec5dc835b3a5175c

commit | commitdiff | tree

Kévin PETIT [Fri, 7 Feb 2014 17:04:13 +0000 (17:04 +0000)]

Fix build dependencies

Use LOCAL_SHARED_LIBRARIES instead of LDFLAGS to link with libraries.

Change-Id: I958c2f0b8b149f5311285703d55f6f6e76d577a9
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>

commit | commitdiff | tree

Ying Wang [Fri, 7 Mar 2014 19:40:56 +0000 (19:40 +0000)]

am f88a1cfc: Merge "Build against the NDK for all archs."

* commit 'f88a1cfcd8da4bf2987c7ceb904b18b1ae6e0980':
Build against the NDK for all archs.

commit | commitdiff | tree

Baligh Uddin [Thu, 20 Feb 2014 21:14:32 +0000 (21:14 +0000)]

am 6d229a72: (-s ours) am fea074ff: (-s ours) am d8b9e39e: (-s ours) am 9d8187cb: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Thu, 20 Feb 2014 21:11:15 +0000 (21:11 +0000)]

am fea074ff: (-s ours) am d8b9e39e: (-s ours) am 9d8187cb: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Thu, 20 Feb 2014 21:08:45 +0000 (21:08 +0000)]

am d8b9e39e: (-s ours) am 9d8187cb: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Thu, 20 Feb 2014 21:05:53 +0000 (21:05 +0000)]

am 9d8187cb: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Thu, 20 Feb 2014 16:42:24 +0000 (08:42 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Ying Wang [Wed, 19 Feb 2014 21:52:40 +0000 (21:52 +0000)]

am f88a1cfc: Merge "Build against the NDK for all archs."

* commit 'f88a1cfcd8da4bf2987c7ceb904b18b1ae6e0980':
Build against the NDK for all archs.

commit | commitdiff | tree

Ying Wang [Wed, 19 Feb 2014 21:46:02 +0000 (21:46 +0000)]

Merge "Build against the NDK for all archs."

commit | commitdiff | tree

Ying Wang [Wed, 19 Feb 2014 21:40:26 +0000 (13:40 -0800)]

Build against the NDK for all archs.

Change-Id: I29e85f1cef5680d13e96e10154c101f0ad9ee7c8

commit | commitdiff | tree

Baligh Uddin [Tue, 17 Dec 2013 17:44:55 +0000 (17:44 +0000)]

am 7310717c: (-s ours) am e1db6bbe: (-s ours) am 58f3e903: (-s ours) am dae90cf8: (-s ours) Import translations. DO NOT MERGE

* commit '7310717c74ce90b27e92ed9bb0b9d7ee9aeb3da6':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 17 Dec 2013 17:42:10 +0000 (17:42 +0000)]

am e1db6bbe: (-s ours) am 58f3e903: (-s ours) am dae90cf8: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Tue, 17 Dec 2013 17:39:05 +0000 (09:39 -0800)]

am 58f3e903: (-s ours) am dae90cf8: (-s ours) Import translations. DO NOT MERGE

* commit '58f3e903c7cfb5286b3e00dde8974cbc680e00c2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 17 Dec 2013 17:36:52 +0000 (09:36 -0800)]

am dae90cf8: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Mon, 16 Dec 2013 21:03:54 +0000 (13:03 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Mon, 9 Dec 2013 20:17:16 +0000 (20:17 +0000)]

am dcd2be70: (-s ours) am f437ab0c: (-s ours) am 9f7b40e1: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Mon, 9 Dec 2013 20:13:47 +0000 (12:13 -0800)]

am f437ab0c: (-s ours) am 9f7b40e1: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Mon, 9 Dec 2013 20:10:52 +0000 (12:10 -0800)]

am 9f7b40e1: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Mon, 9 Dec 2013 20:06:04 +0000 (12:06 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

The Android Open Source Project [Fri, 6 Dec 2013 01:33:56 +0000 (01:33 +0000)]

am 3103ef8a: am 148552a0: Merge commit \'da6d9776befd7f03cd863654c03327806025f8b6\' into HEAD

* commit '3103ef8a2980f3dda2ec2a24eca5bd248a2262e9':

commit | commitdiff | tree

The Android Open Source Project [Fri, 6 Dec 2013 01:25:43 +0000 (17:25 -0800)]

am 148552a0: Merge commit \'da6d9776befd7f03cd863654c03327806025f8b6\' into HEAD

* commit '148552a0ef3777eccfbcff2297561a4c755c8777':

commit | commitdiff | tree

The Android Open Source Project [Thu, 5 Dec 2013 20:38:22 +0000 (12:38 -0800)]

Merge commit 'da6d9776befd7f03cd863654c03327806025f8b6' into HEAD

commit | commitdiff | tree

Alan Newberger [Wed, 4 Dec 2013 23:58:03 +0000 (23:58 +0000)]

am bff2d101: am 689c1c7d: am d8732fc2: am f9b2d0c7: Remove TRIM support

* commit 'bff2d1018647647875b92e58d79793d392e29625':
Remove TRIM support

commit | commitdiff | tree

Alan Newberger [Wed, 4 Dec 2013 23:55:39 +0000 (15:55 -0800)]

am 689c1c7d: am d8732fc2: am f9b2d0c7: Remove TRIM support

* commit '689c1c7d13f8d1cc01188696cee3d5c8a70e84da':
Remove TRIM support

commit | commitdiff | tree

Alan Newberger [Wed, 4 Dec 2013 23:53:53 +0000 (15:53 -0800)]

am d8732fc2: am f9b2d0c7: Remove TRIM support

* commit 'd8732fc2277b120a4b7b0e978f6a8c18ebc202ed':
Remove TRIM support

commit | commitdiff | tree

Alan Newberger [Wed, 4 Dec 2013 23:51:40 +0000 (15:51 -0800)]

am f9b2d0c7: Remove TRIM support

* commit 'f9b2d0c7775b43996a9b9f51c6fc5ab266042c72':
Remove TRIM support

commit | commitdiff | tree

Alan Newberger [Wed, 4 Dec 2013 23:10:01 +0000 (15:10 -0800)]

Remove TRIM support

Remove the ability to trim a video with the quick menu action.

Bug: 11884080
Change-Id: If00cb31ad6b913012c542a809dba1a8e5d9e5b74

commit | commitdiff | tree

Geoff Mendal [Wed, 4 Dec 2013 22:09:21 +0000 (22:09 +0000)]

am dc0fc0c0: (-s ours) am 3360879d: (-s ours) am 2ecb5944: (-s ours) am be55432c: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Wed, 4 Dec 2013 22:05:33 +0000 (14:05 -0800)]

am 3360879d: (-s ours) am 2ecb5944: (-s ours) am be55432c: (-s ours) Import translations. DO NOT MERGE

* commit '3360879db7b16db9f4ac96f6fcfa403e4acf8dd9':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 4 Dec 2013 22:03:51 +0000 (22:03 +0000)]

am ac917a1d: (-s ours) am 2450dd6d: (-s ours) am ecaad7a2: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Wed, 4 Dec 2013 22:01:23 +0000 (14:01 -0800)]

am 2ecb5944: (-s ours) am be55432c: (-s ours) Import translations. DO NOT MERGE

* commit '2ecb594418aedae10d053512f54d8c0a42a494b6':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 4 Dec 2013 21:59:07 +0000 (13:59 -0800)]

am 2450dd6d: (-s ours) am ecaad7a2: (-s ours) Import translations. DO NOT MERGE

* commit '2450dd6d4a9568b1e264ceb5744bfb4890b4c9b7':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 4 Dec 2013 21:57:16 +0000 (13:57 -0800)]

am be55432c: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Wed, 4 Dec 2013 21:56:55 +0000 (13:56 -0800)]

am ecaad7a2: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Wed, 4 Dec 2013 21:45:51 +0000 (13:45 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Wed, 4 Dec 2013 21:44:30 +0000 (13:44 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Michael Kolb [Tue, 3 Dec 2013 19:20:00 +0000 (11:20 -0800)]

am 7fe487c4: am 240b5cab: am d75b9aee: Fix samsung video recording

* commit '7fe487c4519dd6d3f29242426a77e60e9d1a69d3':
Fix samsung video recording

commit | commitdiff | tree

Michael Kolb [Tue, 3 Dec 2013 19:20:00 +0000 (11:20 -0800)]

am fef79bde: am 795812fd: am 13350e5e: Fix WB indicator override

* commit 'fef79bde66d01ec7976d3978978dc4584c2bc445':
Fix WB indicator override

commit | commitdiff | tree

Michael Kolb [Tue, 3 Dec 2013 19:17:21 +0000 (11:17 -0800)]

am 240b5cab: am d75b9aee: Fix samsung video recording

* commit '240b5cabe460ca72c43394c595615da914ccb7c1':
Fix samsung video recording

commit | commitdiff | tree

Michael Kolb [Tue, 3 Dec 2013 19:17:20 +0000 (11:17 -0800)]

am 795812fd: am 13350e5e: Fix WB indicator override

* commit '795812fdf641e133197fbd29f5f55351f7367092':
Fix WB indicator override

commit | commitdiff | tree

Michael Kolb [Tue, 3 Dec 2013 19:15:09 +0000 (11:15 -0800)]

am d75b9aee: Fix samsung video recording

* commit 'd75b9aee9a205d6c4d96aa8913131430a0d9a399':
Fix samsung video recording

commit | commitdiff | tree

Michael Kolb [Tue, 3 Dec 2013 19:15:08 +0000 (11:15 -0800)]

am 13350e5e: Fix WB indicator override

* commit '13350e5e46db241b4f6d1ad3f371ac7292c12e65':
Fix WB indicator override

commit | commitdiff | tree

Michael Kolb [Thu, 30 May 2013 14:45:41 +0000 (07:45 -0700)]

Fix samsung video recording

Patching Bryce CL into Carlsbad

Bug: 9056573

Change-Id: I81fc31e24fe26bef4179bfc4428def2e8b7d94e9

Conflicts:
src/com/android/camera/VideoModule.java

commit | commitdiff | tree

Michael Kolb [Mon, 24 Jun 2013 20:22:52 +0000 (13:22 -0700)]

Fix WB indicator override

Patching into Carlsbad from Bryce.

Bug: 9372794

Change-Id: I4f23f05ca1acaef84a24034237e82001aac09f78

commit | commitdiff | tree

Michael Kolb [Tue, 3 Dec 2013 18:17:38 +0000 (10:17 -0800)]

am 153a52b3: am 1e5baa47: am 0f7d5488: Revert fixed focus area in CAF mode

* commit '153a52b3517d354a101a0f10d589c88afd6974b6':
Revert fixed focus area in CAF mode

commit | commitdiff | tree

Michael Kolb [Tue, 3 Dec 2013 18:13:28 +0000 (10:13 -0800)]

am 1e5baa47: am 0f7d5488: Revert fixed focus area in CAF mode

* commit '1e5baa473c233f7b4bd1568d5047c20533e4ce59':
Revert fixed focus area in CAF mode

commit | commitdiff | tree

Michael Kolb [Tue, 3 Dec 2013 18:10:46 +0000 (10:10 -0800)]

am 0f7d5488: Revert fixed focus area in CAF mode

* commit '0f7d5488d33988c1ee3636fe3a7d6472bed84f00':
Revert fixed focus area in CAF mode

commit | commitdiff | tree

Michael Kolb [Thu, 11 Jul 2013 20:48:15 +0000 (13:48 -0700)]

Revert fixed focus area in CAF mode

Bug: 9306098

This doesn't set the faces as focus/exp areas yet, but resets the focus area to null
in CAF mode to let the HAL decide focus/exp area.

Cherrypick of Bryce CL into Carlsbad.

Change-Id: I38e31937f64ecdb23d6c79f96040c46652d1d7d0

Conflicts:
src/com/android/camera/FocusOverlayManager.java

commit | commitdiff | tree

Alan Newberger [Tue, 3 Dec 2013 17:39:12 +0000 (09:39 -0800)]

am 69818e57: am a3b92891: am 0d5505dd: Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad

* commit '69818e57c74f176d31ef48c7c628234c240f1412':
Add another HTC picture resolution

commit | commitdiff | tree

Alan Newberger [Tue, 3 Dec 2013 17:35:47 +0000 (09:35 -0800)]

am a3b92891: am 0d5505dd: Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad

* commit 'a3b928919285fbe31a1201cb0b56336a3909cb4f':
Add another HTC picture resolution

commit | commitdiff | tree

Alan Newberger [Tue, 3 Dec 2013 17:31:25 +0000 (09:31 -0800)]

am 0d5505dd: Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad

* commit '0d5505dd1a3bf297677161c4c6608c783d7a2b68':
Add another HTC picture resolution

commit | commitdiff | tree

Alan Newberger [Tue, 3 Dec 2013 17:27:25 +0000 (17:27 +0000)]

Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad

commit | commitdiff | tree

Michael Kolb [Wed, 12 Jun 2013 18:57:45 +0000 (11:57 -0700)]

Add another HTC picture resolution

patching into Carlsbad branch from Bryce

Bug: 9370319

Change-Id: I9b2c45b98c7075fda7289707f1e290fcefc084cc

Conflicts:
res/values/strings.xml

commit | commitdiff | tree

Michael Kolb [Mon, 2 Dec 2013 23:57:24 +0000 (15:57 -0800)]

am a43545d1: am 8850f6d8: am 7993f452: Always set focus mode first before applying scene mode

* commit 'a43545d1ec655719e81d04c2d14440a1418e7178':
Always set focus mode first before applying scene mode

commit | commitdiff | tree

Michael Kolb [Mon, 2 Dec 2013 23:54:53 +0000 (15:54 -0800)]

am 8850f6d8: am 7993f452: Always set focus mode first before applying scene mode

* commit '8850f6d8bf69f6415e7e38448f8ef33824ac67cf':
Always set focus mode first before applying scene mode

commit | commitdiff | tree

Michael Kolb [Mon, 2 Dec 2013 23:52:44 +0000 (15:52 -0800)]

am 7993f452: Always set focus mode first before applying scene mode

* commit '7993f4521011869a794da69e4d0057fe3b0886c3':
Always set focus mode first before applying scene mode

commit | commitdiff | tree

Michael Kolb [Fri, 12 Jul 2013 18:36:47 +0000 (11:36 -0700)]

Always set focus mode first before applying scene mode

cherrypick from Bryce branch

Bug: 9577903
Bug: 11777611

Change-Id: I2c300e443a47c7bc0c20f6aaec6f6e4b6c238880

commit | commitdiff | tree

Seth Raphael [Thu, 28 Nov 2013 01:47:58 +0000 (17:47 -0800)]

am ff67e2a6: am 3a46bed6: am 88f9b3e7: Reduce logging of flattened Preferences

* commit 'ff67e2a6207eaf0196b62c8afcee78c47d90a664':
Reduce logging of flattened Preferences

commit | commitdiff | tree

Seth Raphael [Thu, 28 Nov 2013 01:43:36 +0000 (17:43 -0800)]

am 3a46bed6: am 88f9b3e7: Reduce logging of flattened Preferences

* commit '3a46bed61f9b64d2b252909563caecfd811dd691':
Reduce logging of flattened Preferences

commit | commitdiff | tree

Seth Raphael [Thu, 28 Nov 2013 01:40:56 +0000 (17:40 -0800)]

am 88f9b3e7: Reduce logging of flattened Preferences

* commit '88f9b3e75c313d181c49ac644930627c40b2138d':
Reduce logging of flattened Preferences

commit | commitdiff | tree

Seth Raphael [Wed, 27 Nov 2013 22:29:24 +0000 (14:29 -0800)]

Reduce logging of flattened Preferences

Bug: 11901390

Change-Id: I9f2e27e769fd745be01bb2c12a7f07b45aa0b905

commit | commitdiff | tree

The Android Open Source Project [Tue, 26 Nov 2013 16:38:28 +0000 (08:38 -0800)]

am c4cffe22: am 31b29bdf: Merge in Android 4.4

* commit 'c4cffe22f0bab96a672782a9bd2d24018c01d90d':

commit | commitdiff | tree

Baligh Uddin [Tue, 26 Nov 2013 16:38:28 +0000 (08:38 -0800)]

am 790c7e9a: am 7f18027e: Merge remote-tracking branch \'origin/kitkat-dev\'

* commit '790c7e9acb279a5ee559f239dd3a93c27a4ffac8':
Initial empty repository

commit | commitdiff | tree

The Android Open Source Project [Tue, 26 Nov 2013 00:24:12 +0000 (16:24 -0800)]

am 31b29bdf: Merge in Android 4.4

* commit '31b29bdf560963da62f21a86fca2f6d5b8c4da57':

commit | commitdiff | tree

Baligh Uddin [Tue, 26 Nov 2013 00:24:12 +0000 (16:24 -0800)]

am 7f18027e: Merge remote-tracking branch \'origin/kitkat-dev\'

* commit '7f18027e271253b4eb3ef1b36458be78b7ed5f12':
Initial empty repository

commit | commitdiff | tree

Geoff Mendal [Mon, 25 Nov 2013 21:14:48 +0000 (13:14 -0800)]

am a08365d6: (-s ours) am 3e44cad5: (-s ours) am adf70222: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Mon, 25 Nov 2013 21:11:21 +0000 (13:11 -0800)]

am 3e44cad5: (-s ours) am adf70222: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Mon, 25 Nov 2013 21:08:34 +0000 (13:08 -0800)]

am adf70222: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Mon, 25 Nov 2013 21:07:16 +0000 (13:07 -0800)]

am 7b1d7e46: (-s ours) am 7191c955: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Mon, 25 Nov 2013 21:02:53 +0000 (13:02 -0800)]

am 7191c955: (-s ours) Import translations. DO NOT MERGE

* commit '7191c9558e22e81bdbaf34411bebe92d32eacfbb':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 25 Nov 2013 19:54:26 +0000 (11:54 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Mon, 25 Nov 2013 19:53:21 +0000 (11:53 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

The Android Open Source Project [Mon, 25 Nov 2013 00:22:21 +0000 (16:22 -0800)]

Merge in Android 4.4

commit | commitdiff | tree

The Android Open Source Project [Sat, 23 Nov 2013 01:44:24 +0000 (17:44 -0800)]