OSDN Git Service
Owen Lin [Thu, 17 May 2012 22:32:32 +0000 (15:32 -0700)]
am
84664904: am
20d98161: Merge "Hide the share button if the shared URI is not "content:"." into jb-dev
* commit '
846649046510b9ac75210d7618b2192d40c7a739':
Hide the share button if the shared URI is not "content:".
Owen Lin [Wed, 16 May 2012 20:26:36 +0000 (13:26 -0700)]
am
20d98161: Merge "Hide the share button if the shared URI is not "content:"." into jb-dev
* commit '
20d98161df7427042a69ef38014219ac87a53e36':
Hide the share button if the shared URI is not "content:".
Owen Lin [Wed, 16 May 2012 20:24:06 +0000 (13:24 -0700)]
Merge "Hide the share button if the shared URI is not "content:"." into jb-dev
Eric Fischer [Wed, 16 May 2012 18:33:57 +0000 (11:33 -0700)]
am
e832a0ec: am
bc8d5327: Restore deleted string still referenced from menu resource.
* commit '
e832a0ec023aa22996bd9e488e2a407b84cbe2b9':
Restore deleted string still referenced from menu resource.
Eric Fischer [Wed, 16 May 2012 18:31:38 +0000 (11:31 -0700)]
am
bc8d5327: Restore deleted string still referenced from menu resource.
* commit '
bc8d532738a130474969b7bb158848acd9645bf1':
Restore deleted string still referenced from menu resource.
Eric Fischer [Wed, 16 May 2012 18:29:06 +0000 (11:29 -0700)]
Restore deleted string still referenced from menu resource.
Change-Id: I518dc004a92ee68682c2085c8d2f002896198feb
Eric Fischer [Wed, 16 May 2012 17:50:20 +0000 (10:50 -0700)]
am
80a45af0: (-s ours) am
a30d822e: Import translations. DO NOT MERGE
* commit '
80a45af063396d4770082b542c29738781f4fbc0':
Import translations. DO NOT MERGE
Eric Fischer [Wed, 16 May 2012 17:48:18 +0000 (10:48 -0700)]
am
a30d822e: Import translations. DO NOT MERGE
* commit '
a30d822e6034b3182eca341b4e76f5ecaf484e7a':
Import translations. DO NOT MERGE
Eric Fischer [Wed, 16 May 2012 17:41:21 +0000 (10:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7ce56d9778b2e489bc152e60d5ea9b526701de76
Eric Fischer [Wed, 16 May 2012 17:41:05 +0000 (10:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie35416e91d38c143eaa7d2898d60215d534c0ae6
Owen Lin [Tue, 15 May 2012 23:56:59 +0000 (16:56 -0700)]
Hide the share button if the shared URI is not "content:".
bug:
6494818
Change-Id: I70a2997c07c19433cadee34fa348d27445bf2647
The Android Open Source Project [Wed, 16 May 2012 15:45:46 +0000 (08:45 -0700)]
am
ecee3d35: Reconcile with jb-release nakasi-factoryrom-release
* commit '
ecee3d356546957d897983827d6388fb0a94aed0':
Fix black screen when viewing Gmail image file attachment. Bug:
6415848
Fix crash when select all is pressed.
Fix ANR in PhotoPage.
Fix SinglePhotoDataAdapter getScreenNail()
bug #
6176711: guard against null GalleryActionBar.
The Android Open Source Project [Wed, 16 May 2012 15:41:02 +0000 (08:41 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Id2c75aeb60e36d1eab5c884fcc13bd2e1e6fdeaf
The Android Automerger [Wed, 16 May 2012 14:46:15 +0000 (07:46 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Automerger [Wed, 16 May 2012 14:04:50 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Yuli Huang [Wed, 16 May 2012 05:23:09 +0000 (22:23 -0700)]
am
252f5e76: am
bd7c016d: Avoid black screen when PhotoPage just starts.
* commit '
252f5e767194a26323ac9f2a5c6ae6d60f2a7ece':
Avoid black screen when PhotoPage just starts.
Yuli Huang [Wed, 16 May 2012 05:21:00 +0000 (22:21 -0700)]
am
bd7c016d: Avoid black screen when PhotoPage just starts.
* commit '
bd7c016d728853d38f98a3c6077b7bd9b08858b9':
Avoid black screen when PhotoPage just starts.
Ray Chen [Wed, 16 May 2012 03:32:51 +0000 (20:32 -0700)]
am
7b2e7f01: am
f284d8f4: Merge "Fix
6470803 De-jank for video playback in fullscreen" into jb-dev
* commit '
7b2e7f0199b091beceed87e61be03d681529a1a7':
Fix
6470803 De-jank for video playback in fullscreen
Ray Chen [Wed, 16 May 2012 03:32:50 +0000 (20:32 -0700)]
am
88cdee47: am
3349078e: Merge "Fix
6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps" into jb-dev
* commit '
88cdee4713e0b338b076dc4e7e36256a9a46fdbd':
Fix
6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps
Ray Chen [Wed, 16 May 2012 03:29:54 +0000 (20:29 -0700)]
am
f284d8f4: Merge "Fix
6470803 De-jank for video playback in fullscreen" into jb-dev
* commit '
f284d8f41ffa15cb7bf0167013700ed21f451fab':
Fix
6470803 De-jank for video playback in fullscreen
Ray Chen [Wed, 16 May 2012 03:29:53 +0000 (20:29 -0700)]
am
3349078e: Merge "Fix
6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps" into jb-dev
* commit '
3349078ecd14bb462756c5c1a3a3b594d5b97cb9':
Fix
6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps
Yuli Huang [Tue, 15 May 2012 14:36:59 +0000 (22:36 +0800)]
Avoid black screen when PhotoPage just starts.
bug:
5367032
Change-Id: I6bd56026ec32bcee972d69855966750b9a57cdf4
Ray Chen [Wed, 16 May 2012 01:23:46 +0000 (18:23 -0700)]
Merge "Fix
6470803 De-jank for video playback in fullscreen" into jb-dev
Ray Chen [Wed, 16 May 2012 01:22:13 +0000 (18:22 -0700)]
Merge "Fix
6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps" into jb-dev
Ray Chen [Tue, 15 May 2012 03:22:21 +0000 (11:22 +0800)]
Fix
6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps
Per request, change the confirm dialog message to "Delete the selected item(s)?"
b:
6046544
Change-Id: I46f7fd42a9f9fbf2399aca78ed9b2e67a15acb65
Owen Lin [Wed, 16 May 2012 00:46:12 +0000 (17:46 -0700)]
am
787d57a7: am
65ebe2f7: Merge "Add animation for the paddings in SlotView." into jb-dev
* commit '
787d57a7ed44cde0a74bccca013b5b8f323748dd':
Add animation for the paddings in SlotView.
Owen Lin [Wed, 16 May 2012 00:42:21 +0000 (17:42 -0700)]
am
65ebe2f7: Merge "Add animation for the paddings in SlotView." into jb-dev
* commit '
65ebe2f71fea25ef8a770fbc08af8cc29d80c20d':
Add animation for the paddings in SlotView.
Owen Lin [Wed, 16 May 2012 00:38:52 +0000 (17:38 -0700)]
Merge "Add animation for the paddings in SlotView." into jb-dev
Eric Fischer [Tue, 15 May 2012 22:37:36 +0000 (15:37 -0700)]
am
59d2a10f: (-s ours) am
66e52983: Import translations. DO NOT MERGE
* commit '
59d2a10fbe082fbeb82573af08fc6445dfd90469':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 15 May 2012 22:33:27 +0000 (15:33 -0700)]
am
66e52983: Import translations. DO NOT MERGE
* commit '
66e5298344f12aeb1a652f8731609f7959e15385':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 15 May 2012 22:29:36 +0000 (15:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie14d3f0aef0ada917b7de6b4176d442565ae9b3a
Eric Fischer [Tue, 15 May 2012 22:29:21 +0000 (15:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: If6a4cfc400038645f49db5604b6bd58b5207aa96
The Android Automerger [Tue, 15 May 2012 16:35:45 +0000 (09:35 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Automerger [Tue, 15 May 2012 14:05:34 +0000 (07:05 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Tue, 15 May 2012 02:41:23 +0000 (19:41 -0700)]
am
5cd229b3: (-s ours) am
00af9fc9: Import translations. DO NOT MERGE
* commit '
5cd229b367037fded6eae9fa3a328a9ab4f52508':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 15 May 2012 02:33:26 +0000 (19:33 -0700)]
am
00af9fc9: Import translations. DO NOT MERGE
* commit '
00af9fc9bc8a2eefd3e506ce23fc00c67b1c8be9':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 14 May 2012 18:24:44 +0000 (11:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0a3057ba775776b9148af3e9ab7fd302f21cb8c0
Eric Fischer [Mon, 14 May 2012 18:24:28 +0000 (11:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic6c64cb7f77eeae21d806cd2bcf0c72784fb433a
Owen Lin [Wed, 9 May 2012 03:32:32 +0000 (11:32 +0800)]
Add animation for the paddings in SlotView.
bug:
6383118
Change-Id: I034be207f73b027de448cef562a534f986d0cbe1
The Android Automerger [Mon, 14 May 2012 14:04:52 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Ray Chen [Fri, 11 May 2012 13:50:28 +0000 (21:50 +0800)]
Fix
6470803 De-jank for video playback in fullscreen
b:
6470803
Change-Id: I91fd8430c34e84eac45c33070f0f571627e96820
Wu-cheng Li [Fri, 11 May 2012 12:44:31 +0000 (05:44 -0700)]
am
697069a9: am
666f6f11: Merge "Remove behind screenOrientation from camera activities." into jb-dev
* commit '
697069a9bed362fff120b28d5e87b3345b0e370a':
Remove behind screenOrientation from camera activities.
Wu-cheng Li [Fri, 11 May 2012 12:42:24 +0000 (05:42 -0700)]
am
666f6f11: Merge "Remove behind screenOrientation from camera activities." into jb-dev
* commit '
666f6f11e8019bb3ebc84010cf74a85e9e2019ca':
Remove behind screenOrientation from camera activities.
Wu-cheng Li [Fri, 11 May 2012 12:41:04 +0000 (05:41 -0700)]
Merge "Remove behind screenOrientation from camera activities." into jb-dev
Wu-cheng Li [Fri, 11 May 2012 12:25:22 +0000 (20:25 +0800)]
Remove behind screenOrientation from camera activities.
Camera has both landscape and portrait layouts. Screen orientation
will be set in onCreate. "behind" is not needed anymore.
bug:
6480864
Change-Id: I6fe3bbe85addf30bae0d037fdddd0ee8569238de
Chih-Chung Chang [Fri, 11 May 2012 10:38:27 +0000 (03:38 -0700)]
am
218c3de8: am
6033e075: Merge "Better data change handling for PhotoDataAdapter and PhotoView." into jb-dev
* commit '
218c3de8e1cf515752fe2fa4700c34267fc38eb5':
Better data change handling for PhotoDataAdapter and PhotoView.
Chih-Chung Chang [Fri, 11 May 2012 10:34:49 +0000 (03:34 -0700)]
am
6033e075: Merge "Better data change handling for PhotoDataAdapter and PhotoView." into jb-dev
* commit '
6033e0754ee1e1270cef74e12e40a4f9f2408e91':
Better data change handling for PhotoDataAdapter and PhotoView.
Chih-Chung Chang [Fri, 11 May 2012 10:31:10 +0000 (03:31 -0700)]
Merge "Better data change handling for PhotoDataAdapter and PhotoView." into jb-dev
Chih-Chung Chang [Fri, 11 May 2012 09:20:53 +0000 (17:20 +0800)]
Better data change handling for PhotoDataAdapter and PhotoView.
Change-Id: I0f67d918b95000d10786d2035286e036346bfa4e
Owen Lin [Fri, 11 May 2012 06:17:54 +0000 (23:17 -0700)]
am
35f941db: am
da438c77: Merge "Make sure we won\'t upload recycled bitmap." into jb-dev
* commit '
35f941db269314bc8c866e1ced2de17fd7686c03':
Make sure we won't upload recycled bitmap.
Owen Lin [Fri, 11 May 2012 06:15:49 +0000 (23:15 -0700)]
am
da438c77: Merge "Make sure we won\'t upload recycled bitmap." into jb-dev
* commit '
da438c77120c0ec5a626f78c5dc48dc1c2b0ea26':
Make sure we won't upload recycled bitmap.
Owen Lin [Fri, 11 May 2012 04:17:31 +0000 (21:17 -0700)]
Merge "Make sure we won't upload recycled bitmap." into jb-dev
Chih-Chung Chang [Thu, 10 May 2012 18:56:11 +0000 (11:56 -0700)]
am
dc65d3ac: am
d2e409d1: Merge "Add freeze/unfreeze for GLRootView." into jb-dev
* commit '
dc65d3acb83600b2d9b1f553152ef0701e1eda46':
Add freeze/unfreeze for GLRootView.
Chih-Chung Chang [Thu, 10 May 2012 18:56:09 +0000 (11:56 -0700)]
am
c421de27: am
91c1435e: Merge "Handle ScreenNail size change." into jb-dev
* commit '
c421de27ddd1330732e5f3ceddd4136cb1e27520':
Handle ScreenNail size change.
Chih-Chung Chang [Thu, 10 May 2012 16:26:28 +0000 (09:26 -0700)]
am
d2e409d1: Merge "Add freeze/unfreeze for GLRootView." into jb-dev
* commit '
d2e409d1dd54160483edac3a420f59bc5d83fcc6':
Add freeze/unfreeze for GLRootView.
Chih-Chung Chang [Thu, 10 May 2012 16:26:07 +0000 (09:26 -0700)]
am
91c1435e: Merge "Handle ScreenNail size change." into jb-dev
* commit '
91c1435ea3a25a7c0e071ecf378ed58690b8a650':
Handle ScreenNail size change.
The Android Automerger [Thu, 10 May 2012 14:04:47 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Chih-Chung Chang [Thu, 10 May 2012 08:46:43 +0000 (01:46 -0700)]
Merge "Add freeze/unfreeze for GLRootView." into jb-dev
Chih-Chung Chang [Thu, 10 May 2012 03:03:35 +0000 (11:03 +0800)]
Add freeze/unfreeze for GLRootView.
Change-Id: Ieb78041fea22b064d176ea1318cf5883d5d4c94f
Chih-Chung Chang [Thu, 10 May 2012 03:24:21 +0000 (20:24 -0700)]
Merge "Handle ScreenNail size change." into jb-dev
Eric Fischer [Wed, 9 May 2012 23:20:35 +0000 (16:20 -0700)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Wed, 9 May 2012 18:39:34 +0000 (11:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I649abc52094a6ce50c33f8b83bdb5bee4331f31d
Chih-Chung Chang [Wed, 9 May 2012 17:12:46 +0000 (10:12 -0700)]
am
30c328de: am
7b6ce039: Merge "Revert "Fix
6360834 Select All is shown in place of Deselect all option"" into jb-dev
* commit '
30c328de909a17068dbbb7f972e5b3fabb2d1419':
Revert "Fix
6360834 Select All is shown in place of Deselect all option"
Hung-ying Tyan [Wed, 9 May 2012 17:11:53 +0000 (10:11 -0700)]
am
43db778f: am
c2f441dc: Merge "Mark FileCache initialized after init really goes through." into jb-dev
* commit '
43db778f6b5206b2c9e3a429f0fefccd98b87d0a':
Mark FileCache initialized after init really goes through.
Ray Chen [Wed, 9 May 2012 17:11:52 +0000 (10:11 -0700)]
am
d48bc97b: am
11a3c9c6: Merge "Fix
6360834 Select All is shown in place of Deselect all option" into jb-dev
* commit '
d48bc97be8709cc227b0f82f1296fd5b98932c2c':
Fix
6360834 Select All is shown in place of Deselect all option
Yuli Huang [Wed, 9 May 2012 17:11:52 +0000 (10:11 -0700)]
am
4f7f1090: am
78d5dac0: Crop-image doesn\'t show its title in the action-bar.
* commit '
4f7f109070a8940dfa7e1992a9f7e2fec6e4bf00':
Crop-image doesn't show its title in the action-bar.
Eric Fischer [Wed, 9 May 2012 17:11:51 +0000 (10:11 -0700)]
am
e722b26f: (-s ours) am
b79e7627: Import translations. DO NOT MERGE
* commit '
e722b26f8544f6a5cac701e30490c7de5bddd30e':
Import translations. DO NOT MERGE
Chih-Chung Chang [Wed, 9 May 2012 17:11:51 +0000 (10:11 -0700)]
am
8bd75ae0: am
2ef46ed2: Better orientation change handling.
* commit '
8bd75ae0a35105eddb885f6377d73d26159b8820':
Better orientation change handling.
Owen Lin [Wed, 9 May 2012 17:11:50 +0000 (10:11 -0700)]
am
2c7dccde: am
ec9a0335: Keep the last page if finish() is rejected.
* commit '
2c7dccde7734643fd6e1a68b769c383c587b7601':
Keep the last page if finish() is rejected.
The Android Automerger [Wed, 9 May 2012 14:47:24 +0000 (07:47 -0700)]
merge in jb-release history after reset to jb-dev
Chih-Chung Chang [Wed, 9 May 2012 13:17:10 +0000 (21:17 +0800)]
Handle ScreenNail size change.
Bug:
6355399
Change-Id: Ice7560c12aa06cf8ac58cc3883f0888b5c6e71a5
Chih-Chung Chang [Wed, 9 May 2012 10:31:27 +0000 (03:31 -0700)]
am
7b6ce039: Merge "Revert "Fix
6360834 Select All is shown in place of Deselect all option"" into jb-dev
* commit '
7b6ce03945499a76fd888058a1e6092c34ba8d67':
Revert "Fix
6360834 Select All is shown in place of Deselect all option"
Chih-Chung Chang [Wed, 9 May 2012 10:03:24 +0000 (03:03 -0700)]
Merge "Revert "Fix
6360834 Select All is shown in place of Deselect all option"" into jb-dev
Ray Chen [Wed, 9 May 2012 08:56:29 +0000 (16:56 +0800)]
Revert "Fix
6360834 Select All is shown in place of Deselect all option"
This reverts commit
c90170e80b934700c3e2b9978374fb73a910f68c.
Hung-ying Tyan [Wed, 9 May 2012 08:50:16 +0000 (01:50 -0700)]
am
c2f441dc: Merge "Mark FileCache initialized after init really goes through." into jb-dev
* commit '
c2f441dc1ed400dc446240e9360eeff3d8c8f07c':
Mark FileCache initialized after init really goes through.
Ray Chen [Wed, 9 May 2012 08:49:59 +0000 (01:49 -0700)]
am
11a3c9c6: Merge "Fix
6360834 Select All is shown in place of Deselect all option" into jb-dev
* commit '
11a3c9c68185f05eb390697f5c037c6000aea6de':
Fix
6360834 Select All is shown in place of Deselect all option
Yuli Huang [Wed, 9 May 2012 08:49:59 +0000 (01:49 -0700)]
am
78d5dac0: Crop-image doesn\'t show its title in the action-bar.
* commit '
78d5dac00fd19fdc34269aae7653f9f4839dc357':
Crop-image doesn't show its title in the action-bar.
Eric Fischer [Wed, 9 May 2012 08:48:01 +0000 (01:48 -0700)]
am
b79e7627: Import translations. DO NOT MERGE
* commit '
b79e762798b55d6551c5b78ec09c8234415ac3b5':
Import translations. DO NOT MERGE
Chih-Chung Chang [Wed, 9 May 2012 08:46:22 +0000 (01:46 -0700)]
am
2ef46ed2: Better orientation change handling.
* commit '
2ef46ed28b28b355d7f3f1432c7b1196b832a859':
Better orientation change handling.
Owen Lin [Wed, 9 May 2012 08:46:19 +0000 (01:46 -0700)]
am
ec9a0335: Keep the last page if finish() is rejected.
* commit '
ec9a033559f34e5407387cb7d095aee27ddc337b':
Keep the last page if finish() is rejected.
Hung-ying Tyan [Wed, 9 May 2012 08:08:46 +0000 (01:08 -0700)]
Merge "Mark FileCache initialized after init really goes through." into jb-dev
Owen Lin [Wed, 9 May 2012 05:38:21 +0000 (13:38 +0800)]
Make sure we won't upload recycled bitmap.
bug:
6465117
Change-Id: I97553ba9da0256cfedde3a5752224380b1a3ee6f
Ray Chen [Wed, 9 May 2012 03:54:30 +0000 (20:54 -0700)]
Merge "Fix
6360834 Select All is shown in place of Deselect all option" into jb-dev
Yuli Huang [Wed, 9 May 2012 03:01:11 +0000 (11:01 +0800)]
Crop-image doesn't show its title in the action-bar.
bug:
6464608
Change-Id: I7b463beaa96f5f475812ec4f0c3de1118a6d0895
Hung-ying Tyan [Wed, 9 May 2012 02:38:11 +0000 (10:38 +0800)]
Mark FileCache initialized after init really goes through.
Bug:
5988196
Change-Id: Ia826ce6a33c200a2cd09c21d7ef22f4dd161caa9
Ray Chen [Thu, 3 May 2012 05:10:51 +0000 (13:10 +0800)]
Fix
6360834 Select All is shown in place of Deselect all option
The CL changes the SelectionManager's toggle method so it changes itself to
inverse selection mode when all items are already selected, and onSelectionModeChange
will be triggered so the listener can update the selection menu (Select all/Deselect all)
and ActionBar.
Change-Id: I570a299cc8fd7d1d5acab948f9c6531a9adde486
b:
6360834
Eric Fischer [Tue, 8 May 2012 19:17:19 +0000 (12:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I92195544c0e69468c5aab4e7132d6e5d8ce53945
Eric Fischer [Tue, 8 May 2012 18:32:18 +0000 (11:32 -0700)]
am
67ef88e7: (-s ours) am
dc0e7625: Import translations. DO NOT MERGE
* commit '
67ef88e7f29283e2dce92f7267d3f07e169408b6':
Import translations. DO NOT MERGE
The Android Automerger [Tue, 8 May 2012 15:23:16 +0000 (08:23 -0700)]
merge in jb-release history after reset to jb-dev
Chih-Chung Chang [Tue, 8 May 2012 09:57:33 +0000 (17:57 +0800)]
Better orientation change handling.
Bug
6451117: Preview location is wrong after rotating the device quickly
Bug
6444303: The preview location is wrong when camera is started upside down on tablet
Bug
6451710: Tap to focus broken in landscape
Change-Id: I12fd57d6618ec5521ccc6efcbf65de57ff2ea3d2
Owen Lin [Fri, 4 May 2012 03:46:29 +0000 (11:46 +0800)]
Keep the last page if finish() is rejected.
bug:
6414642
Change-Id: I480edc43608c08088177113cb3607d517c91e9f6
Eric Fischer [Mon, 7 May 2012 20:17:12 +0000 (13:17 -0700)]
am
dc0e7625: Import translations. DO NOT MERGE
* commit '
dc0e7625d69cce4c933f927c0f9474c951abe758':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 7 May 2012 19:09:40 +0000 (12:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia266db1c3715c642e2035b8d0b7b269d07a0a0f6
Eric Fischer [Mon, 7 May 2012 19:09:28 +0000 (12:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie522d1506aea36e73a326270218df5ba0fd5c4a5
Yuli Huang [Mon, 7 May 2012 16:03:23 +0000 (09:03 -0700)]
am
ae7f737d: am
625d51a1: Fix back-button\'s behavior in Crop.
* commit '
ae7f737d29f2298a7f2f8e64672776895b96cd3a':
Fix back-button's behavior in Crop.
Yuli Huang [Mon, 7 May 2012 16:00:52 +0000 (09:00 -0700)]
am
625d51a1: Fix back-button\'s behavior in Crop.
* commit '
625d51a1d6e8cbc5884fdcdddeebcd85454935da':
Fix back-button's behavior in Crop.
Yuli Huang [Mon, 7 May 2012 15:35:42 +0000 (23:35 +0800)]
Fix back-button's behavior in Crop.
bug:
6452504
Change-Id: Ic11dd58c613764e3e6cf7a35135678777e49a4ef
Chih-Chung Chang [Mon, 7 May 2012 14:52:20 +0000 (07:52 -0700)]
am
5cc74cb6: am
194feaf5: Merge "Set default buffer size for SurfaceTexture." into jb-dev
* commit '
5cc74cb64f20d106e9214cbfd0daabf364ed5249':
Set default buffer size for SurfaceTexture.
Chih-Chung Chang [Mon, 7 May 2012 14:49:30 +0000 (07:49 -0700)]
am
194feaf5: Merge "Set default buffer size for SurfaceTexture." into jb-dev
* commit '
194feaf54ddf55455c22ddfd2812f8dc0ed9d25b':
Set default buffer size for SurfaceTexture.
Chih-Chung Chang [Mon, 7 May 2012 14:47:27 +0000 (07:47 -0700)]
Merge "Set default buffer size for SurfaceTexture." into jb-dev
OSDN Git Service
