OSDN Git Service
Michael Kolb [Tue, 13 Aug 2013 01:11:15 +0000 (18:11 -0700)]
am
a7794263: am
0553910d: am
af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce
* commit '
a77942630ca7f3b0ea472f9806390977809e4e03':
Doris Liu [Tue, 13 Aug 2013 01:11:13 +0000 (18:11 -0700)]
am
1e22d9bd: am
edddcab2: am
d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce
* commit '
1e22d9bdda7285053ac0b57d43cef041575cc94f':
Ruben Brunk [Tue, 13 Aug 2013 01:11:12 +0000 (18:11 -0700)]
am
a6ff1663: am
f007ac89: am
6cfb081c: G+ crop overlay shadows. Aspect ratios.
* commit '
a6ff1663887e0e6e9fc3a60b51415f6f7873f2fe':
Bobby Georgescu [Tue, 13 Aug 2013 01:11:10 +0000 (18:11 -0700)]
am
73bfca6f: am
e66f4aba: am
e51f236b: Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce
* commit '
73bfca6f82745ff3a52f7ac03faa734b9f5d6860':
Angus Kong [Tue, 13 Aug 2013 01:11:09 +0000 (18:11 -0700)]
am
a9187510: am
115e8693: am
2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce
* commit '
a9187510448d4e5d2239ed06c137aa2d3cc0a096':
George Mount [Tue, 13 Aug 2013 01:11:08 +0000 (18:11 -0700)]
am
a0ee88a4: am
0e4ba348: am
34a50f0c: Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce
* commit '
a0ee88a40a618a514d99429d04146b64a264e3ad':
Ruben Brunk [Tue, 13 Aug 2013 01:11:06 +0000 (18:11 -0700)]
am
4f087b99: am
207b436c: am
ea2fa83c: Setup geometry xforms and propogation chain.
* commit '
4f087b99b8a3ab50aea097896910ca897047c62d':
Doris Liu [Tue, 13 Aug 2013 01:11:05 +0000 (18:11 -0700)]
am
f141351d: am
5875c082: am
1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce
* commit '
f141351d0008e885889e28f9773b6ba65c1951ee':
Ruben Brunk [Tue, 13 Aug 2013 01:11:03 +0000 (18:11 -0700)]
Baligh Uddin [Tue, 13 Aug 2013 01:11:02 +0000 (18:11 -0700)]
am
4c629168: (-s ours) am
ee3b727a: (-s ours) am
27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
4c629168e7a967032172b7135631a85c49fddbf6':
Baligh Uddin [Tue, 13 Aug 2013 01:11:00 +0000 (18:11 -0700)]
am
d2021a3a: (-s ours) am
a5d4147f: (-s ours) am
ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
d2021a3abd12133c63171ea336e83aefea409465':
Michael Kolb [Mon, 12 Aug 2013 23:51:21 +0000 (16:51 -0700)]
am
0553910d: am
af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce
* commit '
0553910ded3c386c151c29a4f6737b74d75e0284':
Doris Liu [Mon, 12 Aug 2013 23:51:19 +0000 (16:51 -0700)]
am
edddcab2: am
d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce
* commit '
edddcab24d1443fb1a4deccfd2d8ddff5e0dcd8d':
Ruben Brunk [Mon, 12 Aug 2013 23:51:17 +0000 (16:51 -0700)]
am
f007ac89: am
6cfb081c: G+ crop overlay shadows. Aspect ratios.
* commit '
f007ac8938b401d2d780677a3f6da593d3ddd923':
Bobby Georgescu [Mon, 12 Aug 2013 23:51:16 +0000 (16:51 -0700)]
am
e66f4aba: am
e51f236b: Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce
* commit '
e66f4abad0301965351a9c8d02f0d23449b03754':
Angus Kong [Mon, 12 Aug 2013 23:51:14 +0000 (16:51 -0700)]
am
115e8693: am
2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce
* commit '
115e86934c8e5b0be4b24d9e9ad9278425940838':
George Mount [Mon, 12 Aug 2013 23:51:12 +0000 (16:51 -0700)]
am
0e4ba348: am
34a50f0c: Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce
* commit '
0e4ba348606517ce2bfa98e8e9b684f60bf5c36b':
Ruben Brunk [Mon, 12 Aug 2013 23:51:10 +0000 (16:51 -0700)]
am
207b436c: am
ea2fa83c: Setup geometry xforms and propogation chain.
* commit '
207b436c9dd7e09cb8f4fe7709140ffd8967a682':
Doris Liu [Mon, 12 Aug 2013 23:51:08 +0000 (16:51 -0700)]
am
5875c082: am
1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce
* commit '
5875c082565cbaa84a6fe1ad7ccbd7ef54a27eec':
Ruben Brunk [Mon, 12 Aug 2013 23:51:07 +0000 (16:51 -0700)]
Baligh Uddin [Mon, 12 Aug 2013 23:51:05 +0000 (16:51 -0700)]
am
ee3b727a: (-s ours) am
27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
ee3b727ab8aaabded1c9a34a0539b3fe11a57f3a':
Baligh Uddin [Mon, 12 Aug 2013 23:51:03 +0000 (16:51 -0700)]
am
a5d4147f: (-s ours) am
ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
a5d4147fbe63e6383df40da7c532cf5f02aab1d6':
Baligh Uddin [Thu, 1 Aug 2013 21:34:26 +0000 (14:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia632d125addcaa105f70381f36b9ce0b32e50923
Auto-generated-cl: translation import
Baligh Uddin [Tue, 23 Jul 2013 17:01:56 +0000 (17:01 +0000)]
Merge "Import translations. DO NOT MERGE"
Angus Kong [Mon, 22 Jul 2013 22:47:34 +0000 (15:47 -0700)]
Don't enable shutter button before preview started.
bug:
9926593
Change-Id: I26fb1f7490ee1e508fe0abca4faeccd61b500fae
(cherry picked from commit
1bccc910bf18eea6adbbd2a4267731014ee34c7e)
Baligh Uddin [Mon, 22 Jul 2013 18:40:21 +0000 (11:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1a171eb7d785dd0ca138ba8de5b3a09d2558ebd0
Auto-generated-cl: translation import
Baligh Uddin [Thu, 18 Jul 2013 22:06:39 +0000 (15:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9bf4ad76580a5320b45a991f3cbfa0206fae067a
Auto-generated-cl: translation import
John Reck [Wed, 17 Jul 2013 16:50:01 +0000 (09:50 -0700)]
Fix help for GalleryGoogle builds
Bug:
9886976
Change-Id: I23fc78b924f3757f8ab12f84d3a0c97c1adc2333
(cherry picked from commit
7a43c8c3b85d6f9162651d8ed8b3a11a87490824)
Baligh Uddin [Tue, 16 Jul 2013 16:17:28 +0000 (16:17 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 15 Jul 2013 19:05:00 +0000 (12:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I887b7382a447d3ebba208bb5764669b455d61950
Auto-generated-cl: translation import
Baligh Uddin [Mon, 15 Jul 2013 19:04:28 +0000 (12:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idcdf1cc493433b6beb16edb2e0c10be56737ad80
Auto-generated-cl: translation import
Baligh Uddin [Thu, 11 Jul 2013 22:06:29 +0000 (22:06 +0000)]
Merge "Import translations. DO NOT MERGE"
The Android Open Source Project [Thu, 11 Jul 2013 18:49:44 +0000 (11:49 -0700)]
am
f6167c87: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
f6167c87682c118f64f220d7f09da6c4bd766fda':
Doris Liu [Thu, 11 Jul 2013 17:17:36 +0000 (10:17 -0700)]
am
85695457: am
ee14cce0: am
e8e2610f: Fix preview thumb and touch target out of sync
* commit '
85695457ba745d0b22e565c80816a39c4cc0d528':
Fix preview thumb and touch target out of sync
The Android Open Source Project [Thu, 11 Jul 2013 15:23:05 +0000 (08:23 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Iac55adc80b6a38a8e0aadbb9b7de27c7fd7dac2c
The Android Automerger [Thu, 11 Jul 2013 12:55:24 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Baligh Uddin [Thu, 11 Jul 2013 04:00:24 +0000 (21:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2c70d13dce29e66d8ab095bf5cfc68288d8404c4
Auto-generated-cl: translation import
Doris Liu [Wed, 10 Jul 2013 16:48:45 +0000 (09:48 -0700)]
am
ee14cce0: am
e8e2610f: Fix preview thumb and touch target out of sync
* commit '
ee14cce054c74c3eb785de3ea4936c75bb753b6b':
Fix preview thumb and touch target out of sync
Doris Liu [Wed, 10 Jul 2013 16:46:08 +0000 (09:46 -0700)]
am
e8e2610f: Fix preview thumb and touch target out of sync
* commit '
e8e2610f112103e77ffc4b583a752302921131d6':
Fix preview thumb and touch target out of sync
Doris Liu [Tue, 9 Jul 2013 20:09:11 +0000 (13:09 -0700)]
Fix preview thumb and touch target out of sync
Also ensure video module respects system orientation lock
Bug:
9626888
Change-Id: I4d7406c37878446e65d0ad1de3bc6b300acb1b23
(cherry picked from commit
dfc939b80f45d969a44caca4bd397ab0828c562d)
The Android Open Source Project [Wed, 26 Jun 2013 00:02:23 +0000 (17:02 -0700)]
am
57d45b60: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
57d45b6039cd58964f8eec9b35ace0ae5475e12e':
The Android Open Source Project [Tue, 25 Jun 2013 23:13:36 +0000 (16:13 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I0dea6d4a409899be3ba89212b1c269f61db4b453
The Android Automerger [Mon, 24 Jun 2013 21:55:10 +0000 (14:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 24 Jun 2013 21:42:12 +0000 (14:42 -0700)]
Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD
The Android Open Source Project [Fri, 21 Jun 2013 19:02:16 +0000 (12:02 -0700)]
am
090c669e: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
090c669e69279c0dcbe5da2c262578b36a98ace9':
The Android Open Source Project [Fri, 21 Jun 2013 18:57:13 +0000 (11:57 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ifabc6325c7c832b018cfca775680e3e90fc99832
The Android Automerger [Fri, 21 Jun 2013 18:35:52 +0000 (11:35 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Baligh Uddin [Mon, 17 Jun 2013 19:17:25 +0000 (12:17 -0700)]
am
8543578f: (-s ours) am
f36574be: am
baa22861: (-s ours) Import translations. DO NOT MERGE
* commit '
8543578f108d703b7db8fbea3ab5e7f2e7c67483':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 17 Jun 2013 19:14:25 +0000 (12:14 -0700)]
am
f36574be: am
baa22861: (-s ours) Import translations. DO NOT MERGE
* commit '
f36574be8845a69b091684e6c2a904af909c713f':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 17 Jun 2013 19:12:03 +0000 (12:12 -0700)]
am
0722071c: (-s ours) am
edf2adc8: Import translations. DO NOT MERGE
* commit '
0722071c5d180e42f304aaefdc8e1a4cc505bf42':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 17 Jun 2013 19:10:11 +0000 (12:10 -0700)]
am
edf2adc8: Import translations. DO NOT MERGE
* commit '
edf2adc8b2d45d8c067df4e178473ecb27f77c72':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 17 Jun 2013 19:08:29 +0000 (12:08 -0700)]
am
baa22861: (-s ours) Import translations. DO NOT MERGE
* commit '
baa228619eaa813f15c07988511aba924b96b7a1':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 17 Jun 2013 16:45:28 +0000 (09:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8b4d102aceb40167cc5bcf895ce8a7017b246b28
Auto-generated-cl: translation import
Baligh Uddin [Mon, 17 Jun 2013 16:44:43 +0000 (09:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0443c96fc10662ae66201fa2d690f530bc3d0009
Auto-generated-cl: translation import
Baligh Uddin [Mon, 17 Jun 2013 16:44:09 +0000 (09:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia25288fc8663f78cd456231c21b0f8f55ff203d3
Auto-generated-cl: translation import
The Android Open Source Project [Sun, 16 Jun 2013 14:49:19 +0000 (07:49 -0700)]
am
28b13ba1: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
28b13ba10d8e1ce2b29ee548979ab347ec0b8e9e':
The Android Open Source Project [Sun, 16 Jun 2013 14:44:14 +0000 (07:44 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ib2c2ee9efe4216329231a2bf4abc608ea662bc85
The Android Automerger [Sun, 16 Jun 2013 12:55:41 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Baligh Uddin [Sun, 16 Jun 2013 02:42:20 +0000 (19:42 -0700)]
am
fec773cc: (-s ours) am
d1c376a1: am
43c20616: (-s ours) Import translations. DO NOT MERGE
* commit '
fec773ccc9b92353a986bcab69e07d36ed31e16e':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 16 Jun 2013 02:39:33 +0000 (19:39 -0700)]
am
d1c376a1: am
43c20616: (-s ours) Import translations. DO NOT MERGE
* commit '
d1c376a1cc31de1202c3041be8aa637cfa7d9a7a':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 16 Jun 2013 02:36:55 +0000 (19:36 -0700)]
am
727964ae: (-s ours) am
0baaf2c7: Import translations. DO NOT MERGE
* commit '
727964aecc8c9764e6fb5871b6c36ab860469526':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 16 Jun 2013 02:36:46 +0000 (19:36 -0700)]
am
43c20616: (-s ours) Import translations. DO NOT MERGE
* commit '
43c206167c813b525047a2fc366177579cef7910':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 16 Jun 2013 02:35:23 +0000 (19:35 -0700)]
am
0baaf2c7: Import translations. DO NOT MERGE
* commit '
0baaf2c7bce7d3aad933bf35a0a9147331a12a85':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 15 Jun 2013 05:03:41 +0000 (22:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7f77a0903c9dfb798f44f2755ac5cd431bfec881
Auto-generated-cl: translation import
Baligh Uddin [Sat, 15 Jun 2013 05:03:09 +0000 (22:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I14843535bff905edc2636e256f19bc9c67b6aaa2
Auto-generated-cl: translation import
Baligh Uddin [Sat, 15 Jun 2013 05:02:33 +0000 (22:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I71c6a4b743cd3c587e0c410d84f0e28dfcb605e4
Auto-generated-cl: translation import
The Android Open Source Project [Wed, 12 Jun 2013 14:25:54 +0000 (07:25 -0700)]
am
c5b6bd8e: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
c5b6bd8e53e38db1afd543262490fccc1962f3e9':
Fix text size in the state panel
The Android Open Source Project [Wed, 12 Jun 2013 14:23:43 +0000 (07:23 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I914272e7b65b9b792f8d71f0654ab156fdbef452
The Android Automerger [Wed, 12 Jun 2013 12:56:06 +0000 (05:56 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
nicolasroard [Tue, 11 Jun 2013 02:07:23 +0000 (19:07 -0700)]
Fix text size in the state panel
bug:
9377153
Change-Id: I6a3a383e4180d757f0272492dcadcbfdb580b154
(cherry picked from commit
68cb2b7efda1b35c79279c670b0d3a0bd6df72ae)
nicolasroard [Tue, 11 Jun 2013 21:18:35 +0000 (14:18 -0700)]
am
3de1ebeb: am
a4d93ac0: Fix text size in the state panel
* commit '
3de1ebebe75042cd7dc342c4e3fa094bbb5cbc8d':
Fix text size in the state panel
Baligh Uddin [Tue, 11 Jun 2013 21:18:34 +0000 (14:18 -0700)]
am
3570306f: (-s ours) am
aea40fd2: Import translations. DO NOT MERGE
* commit '
3570306fbaab44149ebf4dc4ae97bfc2f783071b':
Import translations. DO NOT MERGE
nicolasroard [Tue, 11 Jun 2013 21:11:17 +0000 (14:11 -0700)]
am
a4d93ac0: Fix text size in the state panel
* commit '
a4d93ac033712096c820840b31e7017f850f8e74':
Fix text size in the state panel
Baligh Uddin [Tue, 11 Jun 2013 21:10:31 +0000 (14:10 -0700)]
am
aea40fd2: Import translations. DO NOT MERGE
* commit '
aea40fd2a111904fa37699d8d90456813afff895':
Import translations. DO NOT MERGE
nicolasroard [Tue, 11 Jun 2013 02:07:23 +0000 (19:07 -0700)]
Fix text size in the state panel
bug:
9377153
Change-Id: I6a3a383e4180d757f0272492dcadcbfdb580b154
(cherry picked from commit
68cb2b7efda1b35c79279c670b0d3a0bd6df72ae)
Baligh Uddin [Tue, 11 Jun 2013 15:51:28 +0000 (15:51 +0000)]
Merge "Import translations. DO NOT MERGE"
The Android Open Source Project [Mon, 10 Jun 2013 18:11:48 +0000 (11:11 -0700)]
am
55a3c0dd: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
55a3c0dd0d34a17ca966ed1652e7d7ba9deb3240':
Baligh Uddin [Mon, 10 Jun 2013 17:35:27 +0000 (10:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5aefa1d9ad0feb6282b3a012d568ee8879062eb1
Auto-generated-cl: translation import
Baligh Uddin [Mon, 10 Jun 2013 17:34:47 +0000 (10:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0522f769ec1fc9992a884462a1a4a6639ba1ee7f
Auto-generated-cl: translation import
The Android Open Source Project [Mon, 10 Jun 2013 15:14:04 +0000 (08:14 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I5a0af2cc544c873654fb328b96b0bf1eed32d4ef
The Android Automerger [Sun, 9 Jun 2013 12:55:46 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Baligh Uddin [Fri, 7 Jun 2013 16:39:05 +0000 (16:39 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 7 Jun 2013 16:36:34 +0000 (09:36 -0700)]
am
57e90a2a: (-s ours) am
5412abc0: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
57e90a2a67144aa37fc2b6905c9c011589d4c99c':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Jun 2013 16:34:11 +0000 (09:34 -0700)]
am
5412abc0: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
5412abc08d27c19d28aa32e743e911f3a680a25d':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Jun 2013 16:32:05 +0000 (16:32 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
John Reck [Thu, 6 Jun 2013 21:05:38 +0000 (14:05 -0700)]
am
2f1b8478: am
1ed8e6ff: am
5a193f9d: Merge "fix typo for AndroidManifest.xml"
* commit '
2f1b8478057e1ca562fd2a586e13e1fe990e3716':
fix typo for AndroidManifest.xml
John Reck [Thu, 6 Jun 2013 21:03:32 +0000 (14:03 -0700)]
am
1ed8e6ff: am
5a193f9d: Merge "fix typo for AndroidManifest.xml"
* commit '
1ed8e6ffcff4efaeb861ccbc0c2483cd17f79a64':
fix typo for AndroidManifest.xml
John Reck [Thu, 6 Jun 2013 21:01:45 +0000 (14:01 -0700)]
am
5a193f9d: Merge "fix typo for AndroidManifest.xml"
* commit '
5a193f9da6e87c7b15e627aedfb1e8f5d1df66e3':
fix typo for AndroidManifest.xml
John Reck [Thu, 6 Jun 2013 20:59:37 +0000 (20:59 +0000)]
Merge "fix typo for AndroidManifest.xml"
The Android Open Source Project [Thu, 6 Jun 2013 17:43:02 +0000 (10:43 -0700)]
am
143563e9: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
143563e9d0b236322114cfb210eb899a747826dc':
Update preview size for focus manager after rotation
The Android Open Source Project [Thu, 6 Jun 2013 17:37:37 +0000 (10:37 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I935b9694f3885d28f3d3af62459a91fb354ad6f2
The Android Automerger [Thu, 6 Jun 2013 12:55:43 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Sungmin Choi [Thu, 6 Jun 2013 03:51:12 +0000 (20:51 -0700)]
fix typo for AndroidManifest.xml
Change-Id: I686047b4807ebcc9bc706a813a63e30d9f826b9f
Doris Liu [Wed, 5 Jun 2013 17:51:10 +0000 (10:51 -0700)]
Update preview size for focus manager after rotation
Bug:
9282724
Change-Id: I5c0f0ecb2bf47e9600198450a9fce3590b2c5d10
(cherry picked from commit
c71bd4f897a2322baa6765aa8abcf2c3fe35c05a)
Doris Liu [Wed, 5 Jun 2013 21:10:33 +0000 (14:10 -0700)]
am
164a0b6a: am
6c604d61: Update preview size for focus manager after rotation
* commit '
164a0b6a74f2f61577cbd473a0e6a4d11a222f1f':
Update preview size for focus manager after rotation
Doris Liu [Wed, 5 Jun 2013 21:07:05 +0000 (14:07 -0700)]
am
6c604d61: Update preview size for focus manager after rotation
* commit '
6c604d616ff796f1ec41d4ad7212729cf469e8f5':
Update preview size for focus manager after rotation
Doris Liu [Wed, 5 Jun 2013 17:51:10 +0000 (10:51 -0700)]
Update preview size for focus manager after rotation
Bug:
9282724
Change-Id: I5c0f0ecb2bf47e9600198450a9fce3590b2c5d10
(cherry picked from commit
c71bd4f897a2322baa6765aa8abcf2c3fe35c05a)
Baligh Uddin [Wed, 5 Jun 2013 19:20:54 +0000 (12:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1adebd103b1d17cc9047f919934e3e55d55350ef
Auto-generated-cl: translation import
Baligh Uddin [Wed, 5 Jun 2013 19:20:16 +0000 (12:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I347b083e229cf1f1b2a268ed5119f13684cc78d7
Auto-generated-cl: translation import
The Android Automerger [Wed, 5 Jun 2013 17:19:59 +0000 (10:19 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
OSDN Git Service
