OSDN Git Service
Yuli Huang [Mon, 11 Jun 2012 15:49:58 +0000 (08:49 -0700)]
am
4712ffa6: am
132db75a: Don\'t display loading text when loading album sets.
* commit '
4712ffa668e60c23418be104a66f07da57d64cc2':
Don't display loading text when loading album sets.
Yuli Huang [Mon, 11 Jun 2012 15:48:20 +0000 (08:48 -0700)]
am
132db75a: Don\'t display loading text when loading album sets.
* commit '
132db75a1fa9b41d3000c6cb29bd3d90a7d8ef28':
Don't display loading text when loading album sets.
Yuli Huang [Mon, 11 Jun 2012 06:29:23 +0000 (14:29 +0800)]
Don't display loading text when loading album sets.
bug:
6635606
Change-Id: I55f0dafd5ead8455ed8bee1f03c06ca03662ebbd
Eric Fischer [Fri, 8 Jun 2012 23:33:46 +0000 (16:33 -0700)]
am
30116cd2: (-s ours) am
1d3a2ec8: Import translations. DO NOT MERGE
* commit '
30116cd2dd2b0da7e70537d6a52b1a620eef75d0':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 8 Jun 2012 23:32:09 +0000 (16:32 -0700)]
am
1d3a2ec8: Import translations. DO NOT MERGE
* commit '
1d3a2ec89bd286f253f1f050f7e9e5406119273b':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 8 Jun 2012 23:26:27 +0000 (16:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3e067ce23fd1d27086b2a8b60e7532f6aa8f7601
The Android Open Source Project [Thu, 7 Jun 2012 14:55:30 +0000 (07:55 -0700)]
The Android Open Source Project [Thu, 7 Jun 2012 14:51:25 +0000 (07:51 -0700)]
Reconcile with jb-release
Change-Id: I617695b74de11b9aec6d4b4355d6859f0ada53e8
The Android Automerger [Thu, 7 Jun 2012 14:03:57 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Wei Huang [Wed, 6 Jun 2012 21:51:43 +0000 (14:51 -0700)]
am
5543eac3: am
e6d36bb2: Merge "Check the offset of output rect when cropping image." into jb-dev
* commit '
5543eac38b2bd0e0606deaf8da15d20f415c748f':
Check the offset of output rect when cropping image.
Wei Huang [Wed, 6 Jun 2012 21:49:49 +0000 (14:49 -0700)]
am
e6d36bb2: Merge "Check the offset of output rect when cropping image." into jb-dev
* commit '
e6d36bb213c749a750bffd5e37ce85c232a64ff3':
Check the offset of output rect when cropping image.
Wei Huang [Wed, 6 Jun 2012 21:47:58 +0000 (14:47 -0700)]
Merge "Check the offset of output rect when cropping image." into jb-dev
Eric Fischer [Wed, 6 Jun 2012 18:06:13 +0000 (11:06 -0700)]
am
6edae671: (-s ours) am
699ef52c: Import translations. DO NOT MERGE
* commit '
6edae671aa8f5da345420185f7ecd61fe2d2e6dd':
Import translations. DO NOT MERGE
Eric Fischer [Wed, 6 Jun 2012 18:01:47 +0000 (11:01 -0700)]
am
699ef52c: Import translations. DO NOT MERGE
* commit '
699ef52cb398a2d5a7ec962e7df2837a6dbccef4':
Import translations. DO NOT MERGE
Eric Fischer [Wed, 6 Jun 2012 17:56:34 +0000 (10:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5847ab732e86841a916b6d641766c329c4e367be
Eric Fischer [Wed, 6 Jun 2012 17:56:12 +0000 (10:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I543c2eab5652cf2f6ad3534ce9d59bd3a973e74b
The Android Automerger [Wed, 6 Jun 2012 14:03:47 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Owen Lin [Wed, 30 May 2012 08:39:21 +0000 (16:39 +0800)]
Check the offset of output rect when cropping image.
bug:
6568720
Change-Id: I36c98cab5830eaac15369ada1a1a988e10b0fbf4
Wei Huang [Tue, 5 Jun 2012 19:26:00 +0000 (12:26 -0700)]
am
98e39643: am
1b27f309: Merge "Update drawable for the new resize handles." into jb-dev
* commit '
98e3964391668a5774e2d9b06751e8b2c61c144a':
Update drawable for the new resize handles.
Eric Fischer [Tue, 5 Jun 2012 19:25:36 +0000 (12:25 -0700)]
am
cc9da2a5: (-s ours) am
49661d3f: Import translations. DO NOT MERGE
* commit '
cc9da2a5704a3b76027eac8a20ff2c1de407a9f9':
Import translations. DO NOT MERGE
Wei Huang [Tue, 5 Jun 2012 18:08:59 +0000 (11:08 -0700)]
am
1b27f309: Merge "Update drawable for the new resize handles." into jb-dev
* commit '
1b27f3096d814d7b2a536dde59d7dbfc91945a05':
Update drawable for the new resize handles.
Wei Huang [Tue, 5 Jun 2012 18:07:14 +0000 (11:07 -0700)]
Merge "Update drawable for the new resize handles." into jb-dev
Eric Fischer [Tue, 5 Jun 2012 16:47:02 +0000 (09:47 -0700)]
am
49661d3f: Import translations. DO NOT MERGE
* commit '
49661d3f313d32620cb15247a46e593e333a778d':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 5 Jun 2012 16:39:40 +0000 (09:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7ad1b46db67adde3e45c2dc24b77622a29af3150
Eric Fischer [Tue, 5 Jun 2012 16:39:21 +0000 (09:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3b315a50d72129caf734b5d7279e352e73d74cdb
The Android Automerger [Tue, 5 Jun 2012 13:59:32 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Yuli Huang [Tue, 5 Jun 2012 10:28:16 +0000 (18:28 +0800)]
Update drawable for the new resize handles.
bug:
6598235
Change-Id: Id765f4024ad2896b3f172dce3408b2634fb1eb18
Eric Fischer [Mon, 4 Jun 2012 22:00:18 +0000 (15:00 -0700)]
am
8ddda9cd: (-s ours) am
b4343fb4: Import translations. DO NOT MERGE
* commit '
8ddda9cda3a1a04d21f209dcbbdc81964582f6bd':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 4 Jun 2012 21:56:25 +0000 (14:56 -0700)]
am
b4343fb4: Import translations. DO NOT MERGE
* commit '
b4343fb4517a760f09fb383b7b382ac793e01144':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 4 Jun 2012 21:45:24 +0000 (14:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I630c967050e27c228f1f05333cc2a3590b3eadcb
Eric Fischer [Mon, 4 Jun 2012 21:44:28 +0000 (14:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idb069f2aca29a88fa1b34d7198968109fe88fa9e
Wei Huang [Mon, 4 Jun 2012 16:20:43 +0000 (09:20 -0700)]
am
2f6fb1ce: am
25a91535: Merge "Update the screen nail size even if screen nail is still the same one." into jb-dev
* commit '
2f6fb1ceef0fa27ecea869934b4c09ade97ec2cc':
Update the screen nail size even if screen nail is still the same one.
Wei Huang [Mon, 4 Jun 2012 16:18:09 +0000 (09:18 -0700)]
am
25a91535: Merge "Update the screen nail size even if screen nail is still the same one." into jb-dev
* commit '
25a9153565d0ecd760387499fce4ba10474175d2':
Update the screen nail size even if screen nail is still the same one.
Wei Huang [Mon, 4 Jun 2012 16:15:15 +0000 (09:15 -0700)]
Merge "Update the screen nail size even if screen nail is still the same one." into jb-dev
The Android Automerger [Sun, 3 Jun 2012 13:04:40 +0000 (06:04 -0700)]
merge in jb-release history after reset to jb-dev
Ruei-sung Lin [Sun, 3 Jun 2012 04:36:33 +0000 (21:36 -0700)]
am
30e51141: am
e5c8ed74: Fix b/
6590795 dejank photo effect slider
* commit '
30e511418cb69e04525964675885485dde18da8a':
Fix b/
6590795 dejank photo effect slider
Ruei-sung Lin [Sun, 3 Jun 2012 04:34:16 +0000 (21:34 -0700)]
am
e5c8ed74: Fix b/
6590795 dejank photo effect slider
* commit '
e5c8ed74768f16e4e82c46a31d5118788dbb3a57':
Fix b/
6590795 dejank photo effect slider
Ruei-sung Lin [Thu, 31 May 2012 18:59:31 +0000 (11:59 -0700)]
Fix b/
6590795 dejank photo effect slider
Change-Id: I14737bd01361b58c6bd4af19957d514368cc19ea
Jean-Baptiste Queru [Sat, 2 Jun 2012 02:00:39 +0000 (19:00 -0700)]
am
0ab62de3: Merge
79b8f0b7
* commit '
0ab62de3e8d00c6d1ed9c7cc67a41125468b1c05':
Adding xhdpi version of app icon. Bug:
6596419
Jean-Baptiste Queru [Sat, 2 Jun 2012 01:57:17 +0000 (18:57 -0700)]
Merge
79b8f0b7
Change-Id: Ideb1bf5d1d40baff73f662c3eaad200ad9dc94ac
Chih-Chung Chang [Fri, 1 Jun 2012 19:03:08 +0000 (12:03 -0700)]
Update the screen nail size even if screen nail is still the same one.
Because the rotation value may have changed.
Bug:
6594218
Change-Id: I8da2a3041da0e27e1b80723dab8a825a2350c2dd
Christian Robertson [Fri, 1 Jun 2012 18:11:49 +0000 (11:11 -0700)]
Adding xhdpi version of app icon. Bug:
6596419
Change-Id: I6f8b044d14854f41a4ba788756045f1ee1f56759
Eric Fischer [Fri, 1 Jun 2012 18:02:34 +0000 (11:02 -0700)]
am
309a9cbb: (-s ours) am
8da8d1d4: Import translations. DO NOT MERGE
* commit '
309a9cbb72f6dccc1dc972a72da02935f2f0331e':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 1 Jun 2012 18:00:46 +0000 (11:00 -0700)]
am
8da8d1d4: Import translations. DO NOT MERGE
* commit '
8da8d1d488698ce545ca056f119a03a4f4b189ec':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 1 Jun 2012 17:19:20 +0000 (10:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia4cc33ee514ce169636fda6e8007389ac60c8e17
Eric Fischer [Fri, 1 Jun 2012 17:19:04 +0000 (10:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie58fbc6fe46cbf13cf54a0db03d50bda43f778de
Wei Huang [Fri, 1 Jun 2012 05:22:26 +0000 (22:22 -0700)]
am
e2b5f9f4: am
9d4ee023: Merge "Use "Gallery" instead of "Photo Studio" as the label for photo editor." into jb-dev
* commit '
e2b5f9f468360ca19e446c9d94d4a0120024d3aa':
Use "Gallery" instead of "Photo Studio" as the label for photo editor.
Wei Huang [Fri, 1 Jun 2012 05:19:43 +0000 (22:19 -0700)]
am
9d4ee023: Merge "Use "Gallery" instead of "Photo Studio" as the label for photo editor." into jb-dev
* commit '
9d4ee023cb6b754d07d33fb94dd7ae33851b2d35':
Use "Gallery" instead of "Photo Studio" as the label for photo editor.
Wei Huang [Fri, 1 Jun 2012 05:17:50 +0000 (22:17 -0700)]
Merge "Use "Gallery" instead of "Photo Studio" as the label for photo editor." into jb-dev
Chih-Chung Chang [Thu, 31 May 2012 23:08:28 +0000 (16:08 -0700)]
am
1eed3b2a: am
6f30a447: Merge "Don\'t allow the orientation to be unlocked if "Rotation Lock" is checked in Settings." into jb-dev
* commit '
1eed3b2ac7abb0fc2078605d9341f14f6197dbf5':
Don't allow the orientation to be unlocked if "Rotation Lock" is checked in Settings.
Chih-Chung Chang [Thu, 31 May 2012 23:05:39 +0000 (16:05 -0700)]
am
6f30a447: Merge "Don\'t allow the orientation to be unlocked if "Rotation Lock" is checked in Settings." into jb-dev
* commit '
6f30a44785f5dc19d3db1b3d80d828826c2a44dd':
Don't allow the orientation to be unlocked if "Rotation Lock" is checked in Settings.
Chih-Chung Chang [Thu, 31 May 2012 23:03:31 +0000 (16:03 -0700)]
Merge "Don't allow the orientation to be unlocked if "Rotation Lock" is checked in Settings." into jb-dev
Chih-Chung Chang [Thu, 31 May 2012 20:34:15 +0000 (13:34 -0700)]
Use "Gallery" instead of "Photo Studio" as the label for photo editor.
Bug:
6589966
Change-Id: I0760fa6864da5c398e157f386295dea372f0b33e
Eric Fischer [Thu, 31 May 2012 18:16:47 +0000 (11:16 -0700)]
am
06baaba7: (-s ours) am
a72d51b6: Import translations. DO NOT MERGE
* commit '
06baaba784177d3b75b8e653f3f558ece40400be':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 31 May 2012 18:14:09 +0000 (11:14 -0700)]
am
a72d51b6: Import translations. DO NOT MERGE
* commit '
a72d51b6a4b5dadc0dea91882e0cdafc97c652b3':
Import translations. DO NOT MERGE
Chih-Chung Chang [Thu, 31 May 2012 17:52:07 +0000 (10:52 -0700)]
Don't allow the orientation to be unlocked if "Rotation Lock" is checked in Settings.
Bug:
6577802
Change-Id: I5c8eefbb154eedcf71e80e082261e38450105892
Eric Fischer [Thu, 31 May 2012 17:59:13 +0000 (10:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2bcbcd25d41212cb4e81b1e2f621f635cb1d9c8a
Eric Fischer [Thu, 31 May 2012 17:58:53 +0000 (10:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I854fe48674bc25b209370d0e943bba9704fdf3cd
The Android Automerger [Thu, 31 May 2012 14:04:25 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Chih-Chung Chang [Thu, 31 May 2012 06:23:26 +0000 (23:23 -0700)]
am
5d67dcb7: am
192b7f1d: Improve scale gesture snapback.
* commit '
5d67dcb792f4799c8aff6f2b2db74b28eff0b3d2':
Improve scale gesture snapback.
Chih-Chung Chang [Thu, 31 May 2012 06:21:55 +0000 (23:21 -0700)]
am
192b7f1d: Improve scale gesture snapback.
* commit '
192b7f1ddf08e7bfa0c65dbf61edb81ebb5a0998':
Improve scale gesture snapback.
Chih-Chung Chang [Wed, 30 May 2012 22:47:44 +0000 (15:47 -0700)]
Improve scale gesture snapback.
If the picture is zoomed-in, we want to keep the focus point stay in
the same position on screen, so we need to adjust the target mCurrentX
value.
Bug:
6563619
Change-Id: I87b23da99aced1490187e550bd43fad733122577
Chih-Chung Chang [Thu, 31 May 2012 05:49:33 +0000 (22:49 -0700)]
am
eb72c11f: am
f3f90752: If the focused box was at minimal scale, we try to make it the minimal scale under the new view size.
* commit '
eb72c11fe3ec4c145ec2d0ee81684ff8bf667683':
If the focused box was at minimal scale, we try to make it the minimal scale under the new view size.
Chih-Chung Chang [Thu, 31 May 2012 05:47:20 +0000 (22:47 -0700)]
am
f3f90752: If the focused box was at minimal scale, we try to make it the minimal scale under the new view size.
* commit '
f3f90752ca92372d61ca0ec22a9846261cfbcbde':
If the focused box was at minimal scale, we try to make it the minimal scale under the new view size.
Chih-Chung Chang [Thu, 31 May 2012 01:39:05 +0000 (18:39 -0700)]
am
cda378ac: am
42e1fed4: Move to final position after view size change.
* commit '
cda378ac40ca7f317ad9eae387b45140b5bded8f':
Move to final position after view size change.
Chih-Chung Chang [Thu, 31 May 2012 01:36:33 +0000 (18:36 -0700)]
am
42e1fed4: Move to final position after view size change.
* commit '
42e1fed4edd9ed1e326aab2f7969242c56812952':
Move to final position after view size change.
Chih-Chung Chang [Thu, 31 May 2012 00:10:32 +0000 (17:10 -0700)]
If the focused box was at minimal scale, we try to make it the
minimal scale under the new view size.
Bug:
6584425
Change-Id: I7dcc748cb3659a06f2ca4d8550d075fdda2949fa
Chih-Chung Chang [Wed, 30 May 2012 23:29:18 +0000 (16:29 -0700)]
Move to final position after view size change.
Bug:
6584188
Change-Id: If6ab23532bd7040701e358f9cdd813d2f6a71e5c
Chih-Chung Chang [Wed, 30 May 2012 20:59:25 +0000 (13:59 -0700)]
am
b5110a32: am
28b4d3a8: Merge "Improve image size change handling." into jb-dev
* commit '
b5110a32e9d9dcb221f61cb3547b733f4493a62b':
Improve image size change handling.
Chih-Chung Chang [Wed, 30 May 2012 20:57:00 +0000 (13:57 -0700)]
am
28b4d3a8: Merge "Improve image size change handling." into jb-dev
* commit '
28b4d3a8fd7a70647f9445752bf1a4e73b99f265':
Improve image size change handling.
Chih-Chung Chang [Wed, 30 May 2012 20:52:52 +0000 (13:52 -0700)]
Merge "Improve image size change handling." into jb-dev
Eric Fischer [Wed, 30 May 2012 17:39:40 +0000 (10:39 -0700)]
am
1919a7a2: (-s ours) am
c23258a5: Import translations. DO NOT MERGE
* commit '
1919a7a27641571cec9ed5d9bf4f4ceef3590939':
Import translations. DO NOT MERGE
Eric Fischer [Wed, 30 May 2012 17:35:20 +0000 (10:35 -0700)]
am
c23258a5: Import translations. DO NOT MERGE
* commit '
c23258a525b475666e4bff21da72a9c8a93e4971':
Import translations. DO NOT MERGE
Eric Fischer [Wed, 30 May 2012 17:31:51 +0000 (10:31 -0700)]
Merge "Import translations. DO NOT MERGE"
The Android Open Source Project [Wed, 30 May 2012 17:22:09 +0000 (10:22 -0700)]
The Android Open Source Project [Wed, 30 May 2012 17:16:02 +0000 (10:16 -0700)]
Reconcile with jb-release
Change-Id: Ib078ec6a8d678533d89d2db0d1d8df2fa6c724e8
Eric Fischer [Wed, 30 May 2012 17:10:30 +0000 (10:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I57a2c1fcaa457e650abd4546cf49b764d05036be
Eric Fischer [Wed, 30 May 2012 17:10:02 +0000 (10:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idbc7268dabbede56d3fddb73f3513b8bdcde6a8d
The Android Automerger [Wed, 30 May 2012 14:04:40 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Chih-Chung Chang [Tue, 29 May 2012 22:28:36 +0000 (15:28 -0700)]
Improve image size change handling.
- When the camera relative frame is set, we delay the change for camera
rectange until the next setImageSize call. This avoids the unwanted
intermediate state if we change them separately.
- Don't draw other screennails when the camera is in full screen. This
avoids showing other screennails when the image size changes.
- When the aspect ratio of the image changes, we assume the view angle
of the longer side doesn't change (so the aspect ratio change is because
the view angle of the shorter side changes). This matches what camera
preview does.
Bug:
6566612
Change-Id: I7603416f31c96ba77c96cdc2a3d0b79f8921c491
Eric Fischer [Tue, 29 May 2012 20:46:57 +0000 (13:46 -0700)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Tue, 29 May 2012 20:38:55 +0000 (13:38 -0700)]
Merge "Import translations. DO NOT MERGE"
Wei Huang [Tue, 29 May 2012 20:16:07 +0000 (13:16 -0700)]
am
20582d2f: am
f1f02b6e: Merge "Keep screen on for user-initiated slideshow." into jb-dev
* commit '
20582d2f79f82f8a8529753194c863d1593ad08c':
Keep screen on for user-initiated slideshow.
Wei Huang [Tue, 29 May 2012 20:14:15 +0000 (13:14 -0700)]
am
f1f02b6e: Merge "Keep screen on for user-initiated slideshow." into jb-dev
* commit '
f1f02b6ec5998102257f0c60d61b0b07df796064':
Keep screen on for user-initiated slideshow.
Wei Huang [Tue, 29 May 2012 20:11:12 +0000 (13:11 -0700)]
Merge "Keep screen on for user-initiated slideshow." into jb-dev
Eric Fischer [Tue, 29 May 2012 19:09:23 +0000 (12:09 -0700)]
am
601a18b3: (-s ours) am
cde8d176: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
601a18b3d77a95e37585d051d8de2802bf3c84a4':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 29 May 2012 19:08:08 +0000 (12:08 -0700)]
am
cde8d176: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
cde8d1762af242a89aeea6062b185e7717da5a62':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 29 May 2012 19:06:01 +0000 (12:06 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Tue, 29 May 2012 18:56:33 +0000 (11:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifff95b969b5388df20cd834f81cab4a11ed655bf
Eric Fischer [Tue, 29 May 2012 18:56:21 +0000 (11:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id68af15d8c2c99947e9118446736fda1a588769a
Eric Fischer [Tue, 29 May 2012 18:55:56 +0000 (11:55 -0700)]
am
d31562a6: (-s ours) am
fd08e675: Import translations. DO NOT MERGE
* commit '
d31562a6fdccf6d1b37264c90a623b6c790e9241':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 29 May 2012 18:51:57 +0000 (11:51 -0700)]
am
fd08e675: Import translations. DO NOT MERGE
* commit '
fd08e675f3d83594bb7e78577d40fea1537a4935':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 29 May 2012 17:58:13 +0000 (10:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib9ae85b5013a12c2d2ea10ea7b48d0636797cefd
Eric Fischer [Tue, 29 May 2012 17:57:57 +0000 (10:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief5e6efb118d8e5b229736a5a4c3a22d5b8f796c
Wei Huang [Tue, 29 May 2012 16:57:30 +0000 (09:57 -0700)]
am
0cb52a72: am
20d558a1: Merge "Fix over-sized images in drawable-sw600dp." into jb-dev
* commit '
0cb52a7232d738a58010bed106472b27e0b2c002':
Fix over-sized images in drawable-sw600dp.
Wei Huang [Tue, 29 May 2012 16:54:41 +0000 (09:54 -0700)]
am
20d558a1: Merge "Fix over-sized images in drawable-sw600dp." into jb-dev
* commit '
20d558a1b9d5f0e2b6cf4fa2b7d38b5a5ce8acf6':
Fix over-sized images in drawable-sw600dp.
Wei Huang [Tue, 29 May 2012 16:52:43 +0000 (09:52 -0700)]
Merge "Fix over-sized images in drawable-sw600dp." into jb-dev
The Android Open Source Project [Tue, 29 May 2012 16:45:09 +0000 (09:45 -0700)]
am
7f950388: Reconcile with jb-release nakasi-factoryrom-release
* commit '
7f9503883e36c6201ae1e19cc8442bb1edc5bc19':
The Android Open Source Project [Tue, 29 May 2012 16:41:17 +0000 (09:41 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I066f2ea934faee09776a9c798d414bc6d66a57af
The Android Automerger [Tue, 29 May 2012 15:59:46 +0000 (08:59 -0700)]
merge in jb-release history after reset to jb-dev
OSDN Git Service
