OSDN Git Service
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 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: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: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: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: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: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: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: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: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: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 [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: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: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: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: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: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
The Android Open Source Project [Mon, 3 Jun 2013 23:43:54 +0000 (16:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id191ec4ec57aba482a2e504c2ad8cd5a1af91c53
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.
Baligh Uddin [Mon, 3 Jun 2013 21:45:22 +0000 (14:45 -0700)]
am
2ca1f2a7: am
e40d9a1e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
2ca1f2a7a4cec46988bfc95df5ac056316584f98':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 3 Jun 2013 21:45:21 +0000 (14:45 -0700)]
am
42989297: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
42989297a71cbb59544646fb83551aeac20cc3c5':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 3 Jun 2013 21:42:47 +0000 (14:42 -0700)]
am
e40d9a1e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
e40d9a1e39596220d1949b869ed4c167ca8e63a5':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 3 Jun 2013 21:41:09 +0000 (21:41 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Mon, 3 Jun 2013 21:40:33 +0000 (21:40 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
The Android Open Source Project [Mon, 3 Jun 2013 21:03:32 +0000 (14:03 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: If28ee81947b5975843ee6843824e5f7069333251
Baligh Uddin [Mon, 3 Jun 2013 19:15:52 +0000 (12:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie4057f8b26e13a412015e6e45a50aa5bbf5f077f
Auto-generated-cl: translation import
Baligh Uddin [Mon, 3 Jun 2013 19:15:05 +0000 (12:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8b878349f27250babd1dc79b0a152ae19293242e
Auto-generated-cl: translation import
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.
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.
Ruben Brunk [Mon, 3 Jun 2013 18:17:08 +0000 (11:17 -0700)]
Fixes reading exif tags in editor.
Bug:
9140401
Change-Id: Ic84efca90c5297ab2c6a65b13d512c4799e623f6
The Android Automerger [Sun, 2 Jun 2013 12:55:41 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
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
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
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
Baligh Uddin [Fri, 31 May 2013 22:53:44 +0000 (22:53 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 31 May 2013 22:53:29 +0000 (22:53 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
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.
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.
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)
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.
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
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
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
Michael Kolb [Thu, 30 May 2013 20:37:33 +0000 (20:37 +0000)]
Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce
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
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.
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.
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
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
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
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
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
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
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
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
Baligh Uddin [Wed, 29 May 2013 20:49:26 +0000 (20:49 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 29 May 2013 20:48:44 +0000 (20:48 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Doris Liu [Fri, 24 May 2013 22:58:18 +0000 (15:58 -0700)]
Change the order of exposure compensation
Bug:
9119379
Change-Id: I2e70ab1e83cf322ee0043850b2d27db962039bf3
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
Michael Kolb [Fri, 24 May 2013 19:25:17 +0000 (12:25 -0700)]
am
461e101f: Add 13MP resolution
* commit '
461e101fb99df1a704544efb29e56ece25788985':
Add 13MP resolution
Michael Kolb [Fri, 24 May 2013 16:44:00 +0000 (09:44 -0700)]
Add 13MP resolution
Bug:
9059351
Change-Id: I40c2c94ccc54399f6928d9e8a66abca0df15fea3
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
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
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
OSDN Git Service
