OSDN Git Service
Ruben Brunk [Thu, 21 Feb 2013 21:27:14 +0000 (21:27 +0000)]
am
d633306b: am
88158f57: Removed unsupported GL operations.
* commit '
d633306b1bbc8e97033e26960d633b5168be470d':
Removed unsupported GL operations.
Ruben Brunk [Wed, 20 Feb 2013 23:36:19 +0000 (15:36 -0800)]
am
88158f57: Removed unsupported GL operations.
* commit '
88158f577a2d80a7a3ab5ad92452b6e32b059271':
Removed unsupported GL operations.
Ruben Brunk [Wed, 20 Feb 2013 22:44:02 +0000 (14:44 -0800)]
Removed unsupported GL operations.
Bug:
8223749
Change-Id: I722220def36aa4a9e53666540471100df6609d74
Ed Heyl [Wed, 20 Feb 2013 21:57:22 +0000 (21:57 +0000)]
am
264247a7: Merge remote-tracking branch \'goog/jb-mr2-release\'
* commit '
264247a73a61664d9b76c9eb11f305d264d8e0e2':
Add null check on the source URI
Fix memory leak in ComboPreferences
Ed Heyl [Wed, 20 Feb 2013 21:47:32 +0000 (13:47 -0800)]
Merge remote-tracking branch 'goog/jb-mr2-release'
Victor Doba [Wed, 20 Feb 2013 17:33:25 +0000 (17:33 +0000)]
am
1e3693c0: am
c8e00663: Merge "Show the Utility Panel by default." into gb-ub-photos-bryce
* commit '
1e3693c03d9a08392bbf4a907055ee2baa89f097':
Show the Utility Panel by default.
Victor Doba [Wed, 20 Feb 2013 17:31:38 +0000 (09:31 -0800)]
am
c8e00663: Merge "Show the Utility Panel by default." into gb-ub-photos-bryce
* commit '
c8e006639baf1512715e0d7f2c02f88204ab55c0':
Show the Utility Panel by default.
Victor Doba [Wed, 20 Feb 2013 17:29:53 +0000 (17:29 +0000)]
Merge "Show the Utility Panel by default." into gb-ub-photos-bryce
John Hoford [Wed, 20 Feb 2013 16:48:32 +0000 (16:48 +0000)]
am
789cffa1: am
1863a311: fix vignette startup issues
* commit '
789cffa174bb5f73ee932bedae9b19ba1a20bf92':
fix vignette startup issues
John Hoford [Wed, 20 Feb 2013 16:45:14 +0000 (08:45 -0800)]
am
1863a311: fix vignette startup issues
* commit '
1863a3119a802517b1c2a53763f904f73fdc940b':
fix vignette startup issues
John Hoford [Wed, 20 Feb 2013 16:31:40 +0000 (08:31 -0800)]
fix vignette startup issues
Change-Id: I3a8461edf3239044565611ed35b41cb87e5a529f
The Android Automerger [Wed, 20 Feb 2013 13:56:07 +0000 (05:56 -0800)]
merge in jb-mr2-release history after reset to master
John Hoford [Tue, 19 Feb 2013 23:41:03 +0000 (23:41 +0000)]
am
50046bd3: am
a93d5ee9: add movable vignette
* commit '
50046bd326f943460c05399ca55886922ad818eb':
add movable vignette
John Hoford [Tue, 19 Feb 2013 23:35:59 +0000 (15:35 -0800)]
am
a93d5ee9: add movable vignette
* commit '
a93d5ee9c409e2328dcbe2326591436f8ac23146':
add movable vignette
John Hoford [Sat, 16 Feb 2013 17:20:59 +0000 (09:20 -0800)]
add movable vignette
Change-Id: I54f2fccd0d748ca4c908d5b0f3c3ef7349cd686d
Baligh Uddin [Tue, 19 Feb 2013 19:27:16 +0000 (19:27 +0000)]
am
3c198e8b: (-s ours) am
03010e45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
3c198e8bce7f168a128d1359e8f454cc6cc8ab9b':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Feb 2013 19:27:15 +0000 (19:27 +0000)]
am
8e86278b: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
8e86278b9c27a6236464c936b084ffc907892199':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Feb 2013 19:23:46 +0000 (19:23 +0000)]
am
7ebc6f3f: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
7ebc6f3fa1e0be98a60268fe2ffdc060e21e0195':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Feb 2013 19:23:32 +0000 (11:23 -0800)]
am
03010e45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
03010e45387b8f1a715fd7f5cfac0793008fdc9b':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Feb 2013 19:23:18 +0000 (19:23 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 19 Feb 2013 19:22:16 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Tue, 19 Feb 2013 19:21:08 +0000 (19:21 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 19 Feb 2013 19:17:04 +0000 (19:17 +0000)]
am
346f5bb0: (-s ours) am
fc18a75c: (-s ours) Import translations. DO NOT MERGE
* commit '
346f5bb06b8a73dae28b123e61164bf45d71c092':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Feb 2013 19:14:23 +0000 (11:14 -0800)]
am
fc18a75c: (-s ours) Import translations. DO NOT MERGE
* commit '
fc18a75c530669285ea09714a69ef6c0094c889b':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Feb 2013 19:09:12 +0000 (11:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9dbc652fcb3ab0bc43774e57de6f2aa00454a742
Auto-generated-cl: translation import
Baligh Uddin [Tue, 19 Feb 2013 19:08:44 +0000 (11:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: If262abcd9e8910ccaf49d20f3a853dcf97cd9b63
Auto-generated-cl: translation import
Baligh Uddin [Tue, 19 Feb 2013 19:07:32 +0000 (11:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idc5fea5d79c5cfdbccf8fb4ba3eaa427a148e042
Auto-generated-cl: translation import
Baligh Uddin [Tue, 19 Feb 2013 19:06:45 +0000 (11:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic697e873594208549955d01399accad284b239db
Auto-generated-cl: translation import
Michael Kolb [Tue, 19 Feb 2013 18:15:30 +0000 (18:15 +0000)]
am
13e5b565: am
a96e8879: Fix auto-focus areas
* commit '
13e5b565a30f2fefee91c42d76f84460d2225efc':
Fix auto-focus areas
The Android Automerger [Tue, 19 Feb 2013 17:51:51 +0000 (09:51 -0800)]
merge in jb-mr2-release history after reset to master
Michael Kolb [Tue, 19 Feb 2013 17:51:48 +0000 (09:51 -0800)]
am
a96e8879: Fix auto-focus areas
* commit '
a96e8879473c9f9c937a5f14dbbd35579b4d0952':
Fix auto-focus areas
Michael Kolb [Mon, 18 Feb 2013 23:40:21 +0000 (23:40 +0000)]
am
0888a7b0: am
1bf8b9a5: Fix AF animation
* commit '
0888a7b0eaf31893bb9adfa634ff38740a1ed306':
Fix AF animation
Michael Kolb [Sat, 16 Feb 2013 21:13:47 +0000 (13:13 -0800)]
Fix auto-focus areas
Use a specific focus area in continuous AF
Use a smaller AF area for tap to focus
Change-Id: Ia633dec7c1830c7c03f56434614e9bce3f5697e6
Michael Kolb [Mon, 18 Feb 2013 23:38:56 +0000 (15:38 -0800)]
am
1bf8b9a5: Fix AF animation
* commit '
1bf8b9a5b418891836435f4ec502846640368690':
Fix AF animation
Michael Kolb [Mon, 18 Feb 2013 23:16:44 +0000 (15:16 -0800)]
Fix AF animation
Bug:
8219462
Change-Id: I9c39c70aad8f1ca6763acfc2d2a5ff5c918c71a5
The Android Automerger [Sat, 16 Feb 2013 18:10:52 +0000 (18:10 +0000)]
keep history after reset to master again
Doris Liu [Sat, 16 Feb 2013 01:41:23 +0000 (17:41 -0800)]
am
d9de7afa: Merge "Make photo orientation consistent with UI" into gb-ub-photos-bryce
* commit '
d9de7afa6c343e85b9c2c0221ca280c69a349c5f':
Make photo orientation consistent with UI
Doris Liu [Sat, 16 Feb 2013 01:39:59 +0000 (01:39 +0000)]
Merge "Make photo orientation consistent with UI" into gb-ub-photos-bryce
Doris Liu [Fri, 15 Feb 2013 18:55:37 +0000 (10:55 -0800)]
Make photo orientation consistent with UI
Also fixed the wrong animation orientation.
Bug:
7302506
Change-Id: I58615a7b3cc2e08c2a8dc4e174512a502c2482f5
Angus Kong [Sat, 16 Feb 2013 00:15:52 +0000 (16:15 -0800)]
am
c86e1ca3: Merge "Bump up the version number to 1.1.40002" into gb-ub-photos-bryce
* commit '
c86e1ca339d770b9199cc332a27edcd0f0c42900':
Bump up the version number to 1.1.40002
Angus Kong [Sat, 16 Feb 2013 00:14:01 +0000 (00:14 +0000)]
Merge "Bump up the version number to 1.1.40002" into gb-ub-photos-bryce
Bobby Georgescu [Sat, 16 Feb 2013 00:13:11 +0000 (00:13 +0000)]
am
aa96c225: am
add77dfc: Merge "Importer: Full-screen viewing, UI refinement, refactoring" into gb-ub-photos-bryce
* commit '
aa96c2253bd8650423d9ea4dd5c50b0850df0416':
Importer: Full-screen viewing, UI refinement, refactoring
John Reck [Sat, 16 Feb 2013 00:12:45 +0000 (16:12 -0800)]
am
7db6eb02: Remove more com.android.camera.R
* commit '
7db6eb02312a4c649d34351d1d78add1d8ec814b':
Remove more com.android.camera.R
nicolasroard [Sat, 16 Feb 2013 00:12:43 +0000 (00:12 +0000)]
am
deee4235: am
cd627a70: Merge "Pass the ImagePreset to ImageFilter" into gb-ub-photos-bryce
* commit '
deee423567dc2cc13b009a3485cdfe395dbdf231':
Pass the ImagePreset to ImageFilter
Baligh Uddin [Sat, 16 Feb 2013 00:12:28 +0000 (00:12 +0000)]
am
28ab637f: (-s ours) am
e956f5d5: (-s ours) Import translations. DO NOT MERGE
* commit '
28ab637f20ac2994be00b5f97b7a2efa8d6acc3e':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 16 Feb 2013 00:12:26 +0000 (00:12 +0000)]
am
34ab9444: (-s ours) Import translations. DO NOT MERGE
* commit '
34ab9444c56922ab5edebd6a50a7327ba0a7c2e2':
Import translations. DO NOT MERGE
nicolasroard [Sat, 16 Feb 2013 00:11:18 +0000 (00:11 +0000)]
am
c8505cd1: am
f7cfa85f: Fix curves slowness
* commit '
c8505cd188d04759056079a3ddd18e8b0e4753cd':
Fix curves slowness
nicolasroard [Sat, 16 Feb 2013 00:10:54 +0000 (00:10 +0000)]
am
a78b4141: am
c8aa8ac1: Clean up red eye correction
* commit '
a78b4141955d592b7eb15637b249d93d772bd738':
Clean up red eye correction
John Hoford [Sat, 16 Feb 2013 00:10:48 +0000 (00:10 +0000)]
am
72fc5775: am
4b1e6fbd: fix ranges for various filters
* commit '
72fc5775c5e9040dff8515117e5c545dd227ba09':
fix ranges for various filters
Angus Kong [Sat, 16 Feb 2013 00:10:46 +0000 (00:10 +0000)]
am
1a2ed3a3: am
a241341d: Merge "Wait for the previous MosaicPreviewRenderer to end" into gb-ub-photos-bryce
* commit '
1a2ed3a35ded96fa50d2387645cad3f4e9138810':
Wait for the previous MosaicPreviewRenderer to end
nicolasroard [Sat, 16 Feb 2013 00:10:34 +0000 (00:10 +0000)]
am
cca464d0: am
4d25bee7: Merge "Turn back on the state panel" into gb-ub-photos-bryce
* commit '
cca464d01a9cd0bdfa10ea467e643609e0f0eda5':
Turn back on the state panel
John Hoford [Sat, 16 Feb 2013 00:10:33 +0000 (00:10 +0000)]
am
a6faa75e: am
ac75eb40: Merge "fix the draw clear bug" into gb-ub-photos-bryce
* commit '
a6faa75e53070f4da959a75bcb6f92e578400baa':
fix the draw clear bug
John Reck [Sat, 16 Feb 2013 00:08:26 +0000 (16:08 -0800)]
Remove more com.android.camera.R
Change-Id: I410baaf4a3f0d824d44ea24435a1716cad3bb966
Tenghui Zhu [Sat, 16 Feb 2013 00:09:40 +0000 (00:09 +0000)]
am
f9a2c514: (-s ours) am
882d3acc: (-s ours) Merge "DO NOT MERGE: Don\'t call requestLayout from onLayout" into gb-ub-photos-bryce
* commit '
f9a2c514b460052f91dd4fedd136fdd26cbcdb32':
DO NOT MERGE: Don't call requestLayout from onLayout
Angus Kong [Sat, 16 Feb 2013 00:09:11 +0000 (16:09 -0800)]
Bump up the version number to 1.1.40002
Change-Id: I5911eb3345b7774a6690372999fce3673b551f84
nicolasroard [Sat, 16 Feb 2013 00:08:32 +0000 (00:08 +0000)]
am
b7ab84b1: am
a0d689f1: Add null check on the source URI
* commit '
b7ab84b19b030df753a2248fe9dfa70e1b959ee6':
Add null check on the source URI
nicolasroard [Sat, 16 Feb 2013 00:08:26 +0000 (00:08 +0000)]
am
a4a0fde6: am
80149cd6: Merge "Limit preview size" into gb-ub-photos-bryce
* commit '
a4a0fde618be31cb0c02c8f316e0c62ccd025130':
Limit preview size
Baligh Uddin [Sat, 16 Feb 2013 00:08:25 +0000 (00:08 +0000)]
am
6f8adf03: (-s ours) am
6ed18cb4: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
6f8adf030f86c32df7ea4f6dcf4a5b815a4ee4f8':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 16 Feb 2013 00:08:24 +0000 (00:08 +0000)]
am
288a0da1: (-s ours) am
5f8bb818: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
288a0da10287c8c60fe89bea37f5c781be453b17':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 16 Feb 2013 00:08:23 +0000 (00:08 +0000)]
am
4dd79940: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
4dd799404ae4c521e2a3b29ffed54903f996802a':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 16 Feb 2013 00:08:21 +0000 (00:08 +0000)]
am
02272b84: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
02272b84dbbaf704527d296dcc021b81eff267a7':
Import translations. DO NOT MERGE
nicolasroard [Sat, 16 Feb 2013 00:08:08 +0000 (00:08 +0000)]
am
6dc837b3: am
f6076047: Refactor FiltersManager
* commit '
6dc837b3abb31fcb52aa341f7a470d99f73c87bb':
Refactor FiltersManager
John Hoford [Sat, 16 Feb 2013 00:08:04 +0000 (00:08 +0000)]
am
e44880f3: am
99baf613: refactor quality to be int
* commit '
e44880f3f94927360bde6b1695d7bdd5f76a6386':
refactor quality to be int
nicolasroard [Sat, 16 Feb 2013 00:07:31 +0000 (00:07 +0000)]
am
9e7e35cf: am
b01a3282: Add reset bitmap for RS filters
* commit '
9e7e35cf47a4de7ba71f54c2044246e36ab88ef2':
Add reset bitmap for RS filters
nicolasroard [Sat, 16 Feb 2013 00:07:22 +0000 (00:07 +0000)]
am
3a39e2cd: am
4a3c526c: Update thumbnails when the geometry changes
* commit '
3a39e2cdde40b72cdeef8cd53a952c27d082d529':
Update thumbnails when the geometry changes
nicolasroard [Sat, 16 Feb 2013 00:07:14 +0000 (00:07 +0000)]
am
fa77fa1a: am
263eb844: Merge "Generate thumbnails asynchronously" into gb-ub-photos-bryce
* commit '
fa77fa1a84968ab6a28509a62ff468f70eacb5b6':
Generate thumbnails asynchronously
John Hoford [Sat, 16 Feb 2013 00:07:12 +0000 (00:07 +0000)]
am
98b031de: am
c364d9f2: remove animations if before Jelly Bean
* commit '
98b031de5ac3ee18edd4c663318b99dc385de520':
remove animations if before Jelly Bean
John Hoford [Sat, 16 Feb 2013 00:07:04 +0000 (00:07 +0000)]
am
40ad5fdf: am
e2c4d033: fixes the draw and clean up the UI
* commit '
40ad5fdf758b199f5574edd4b379bcef960859d1':
fixes the draw and clean up the UI
nicolasroard [Sat, 16 Feb 2013 00:06:43 +0000 (00:06 +0000)]
am
7a1b8f1c: am
4b2933f8: Merge "Adding support for ICS" into gb-ub-photos-bryce
* commit '
7a1b8f1c5a162ef2238e475d208254ee37ac7bf2':
Adding support for ICS
John Hoford [Sat, 16 Feb 2013 00:06:06 +0000 (00:06 +0000)]
am
0d663fd5: am
431f45e1: Merge "fix red eye to use the new system" into gb-ub-photos-bryce
* commit '
0d663fd56b288f29f3f202584462353f7f8fdc5d':
fix red eye to use the new system
Stephen Hines [Sat, 16 Feb 2013 00:05:46 +0000 (00:05 +0000)]
am
f4f4be2e: am
46dcad6e: Merge "Switch to GalleryGoogle as default provider for RS files (from Gallery2)." into gb-ub-photos-bryce
* commit '
f4f4be2e68feee304a1c343a9b4d1e9ae2cb6a46':
Switch to GalleryGoogle as default provider for RS files (from Gallery2).
Tim Murray [Sat, 16 Feb 2013 00:05:24 +0000 (00:05 +0000)]
am
10854dc7: am
32ee1acb: Merge "Only create one RS context." into gb-ub-photos-bryce
* commit '
10854dc7b83abe3625c40e8fc22f71ecce908dc4':
Only create one RS context.
nicolasroard [Sat, 16 Feb 2013 00:05:24 +0000 (00:05 +0000)]
am
8bc463b6: am
31e52aae: Move useFilterRepresentation to PanelController
* commit '
8bc463b69019c0389b21e2ebcfb0abc092891468':
Move useFilterRepresentation to PanelController
nicolasroard [Sat, 16 Feb 2013 00:05:05 +0000 (00:05 +0000)]
am
31ec8983: am
2d5cc151: Merge "Cleaning filters" into gb-ub-photos-bryce
* commit '
31ec89833da1ef32dc46f08b3505581355575931':
Cleaning filters
Doris Liu [Sat, 16 Feb 2013 00:04:56 +0000 (00:04 +0000)]
am
644fd645: am
61b332d8: Merge "Lock focus during countdown" into gb-ub-photos-bryce
* commit '
644fd645672cd0f80c9352ec3248e8e7dbab618f':
Lock focus during countdown
Doris Liu [Sat, 16 Feb 2013 00:04:55 +0000 (00:04 +0000)]
am
70a87204: am
401756be: Merge "Fix camera setting icons appearing in wrong place" into gb-ub-photos-bryce
* commit '
70a87204c4d2f53b23879ab5e8a6bbe619bd51b3':
Fix camera setting icons appearing in wrong place
nicolasroard [Sat, 16 Feb 2013 00:03:53 +0000 (00:03 +0000)]
am
6a8cadbc: am
cef6ad5d: Move filter type to representations
* commit '
6a8cadbc30693122f752ddfacc8dcf0129cdfb58':
Move filter type to representations
nicolasroard [Sat, 16 Feb 2013 00:03:51 +0000 (00:03 +0000)]
am
f75463e3: am
50ffa175: Fix crash when reset
* commit '
f75463e342be0c6fcca0b65bfc5a564776473840':
Fix crash when reset
nicolasroard [Sat, 16 Feb 2013 00:03:40 +0000 (00:03 +0000)]
am
5c3d0982: am
4aabe9d1: Merge "Fix loading screen" into gb-ub-photos-bryce
* commit '
5c3d0982badedea68ac991041bb609461f0c631c':
Fix loading screen
John Hoford [Sat, 16 Feb 2013 00:03:27 +0000 (00:03 +0000)]
am
574abbce: am
44a499a6: Fix tiny planet to work with the new framework
* commit '
574abbce8ae2afc854bf7cadd5b552fef5c76f2f':
Fix tiny planet to work with the new framework
John Hoford [Sat, 16 Feb 2013 00:03:04 +0000 (00:03 +0000)]
am
38d71117: am
8029c856: remove slider from FX and Border UI
* commit '
38d71117e7425504354b697471ca2933fe88b864':
remove slider from FX and Border UI
nicolasroard [Sat, 16 Feb 2013 00:03:03 +0000 (00:03 +0000)]
am
df130325: am
6d088c52: Merge "Fix leaks / init" into gb-ub-photos-bryce
* commit '
df1303250231ebb65a0d0cc4fcd9e8f23a8c6c01':
Fix leaks / init
Bobby Georgescu [Sat, 16 Feb 2013 00:02:59 +0000 (00:02 +0000)]
am
af8ffc3c: am
2db8b143: Change transition from Gallery to Filtershow
* commit '
af8ffc3c2c391fb77d084b58adb23c3e55368c7b':
Change transition from Gallery to Filtershow
Bobby Georgescu [Sat, 16 Feb 2013 00:02:42 +0000 (00:02 +0000)]
am
4d22bada: am
7d9a6595: Merge "Replace background getDrawable calls to avoid ANR" into gb-ub-photos-bryce
* commit '
4d22badac1f0b81ac28e7f7a514354fb88fd069e':
Replace background getDrawable calls to avoid ANR
John Reck [Sat, 16 Feb 2013 00:02:34 +0000 (16:02 -0800)]
am
ace62b69: Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
* commit '
ace62b69bd53518faea7be986f6c7481b271ca3f':
Remove com.android.camera.R
John Reck [Sat, 16 Feb 2013 00:01:05 +0000 (00:01 +0000)]
Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
Baligh Uddin [Fri, 15 Feb 2013 23:52:27 +0000 (23:52 +0000)]
am
ebe294e4: (-s ours) am
61f29adf: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
ebe294e42c4f6e4a70a602d857af7cf6857d3472':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Feb 2013 23:52:22 +0000 (23:52 +0000)]
am
4e4ff77d: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
4e4ff77df2d9fe55cd13bc6b9dd7c64ee1ce6a30':
Import translations. DO NOT MERGE
nicolasroard [Fri, 15 Feb 2013 23:52:09 +0000 (23:52 +0000)]
John Reck [Fri, 15 Feb 2013 23:51:30 +0000 (15:51 -0800)]
Remove com.android.camera.R
Change-Id: I0bb03da1423401f872c3bf13caffb9c87d850449
nicolasroard [Fri, 15 Feb 2013 23:51:28 +0000 (23:51 +0000)]
am
770b2fbe: am
bfcc645d: Merge "Fix borders" into gb-ub-photos-bryce
* commit '
770b2fbe8ddfff82db37a46e5a713c2e3b61073f':
Fix borders
Stephen Hines [Fri, 15 Feb 2013 23:51:26 +0000 (23:51 +0000)]
am
97d3c00d: Merge "Switch to GalleryGoogle as default provider for RS files (from Gallery2)."
* commit '
97d3c00d213d03b1a5ca527daff8a84458d096d7':
Switch to GalleryGoogle as default provider for RS files (from Gallery2).
Ying Wang [Fri, 15 Feb 2013 23:51:17 +0000 (23:51 +0000)]
Baligh Uddin [Fri, 15 Feb 2013 23:51:12 +0000 (23:51 +0000)]
am
2ca2d0b4: (-s ours) am
728c036e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
2ca2d0b4214f1bdbbba0d08134fd2a9cb9a88204':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Feb 2013 23:51:08 +0000 (23:51 +0000)]
am
d9b6794e: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
d9b6794ef9cd126d61b8517fbb1d74f3b27d6606':
Import translations. DO NOT MERGE
nicolasroard [Fri, 15 Feb 2013 23:51:07 +0000 (23:51 +0000)]
nicolasroard [Fri, 15 Feb 2013 23:51:00 +0000 (23:51 +0000)]
am
a6a24fe6: am
933f357a: Merge "Fix Fx filters" into gb-ub-photos-bryce
* commit '
a6a24fe64957b4276f19c0a4bd884bd9332e748b':
Fix Fx filters
John Hoford [Fri, 15 Feb 2013 23:50:02 +0000 (23:50 +0000)]
am
b344142b: am
b3825a60: Merge "fix draw and curves to use FilterRepresentation" into gb-ub-photos-bryce
* commit '
b344142ba183e729cbd8470b9e29fe6882539de6':
fix draw and curves to use FilterRepresentation
Jason Noguchi [Fri, 15 Feb 2013 23:50:01 +0000 (23:50 +0000)]
am
659b1978: am
1933d8b2: Merge "Remove reference to local libraries. Make CameraTest build against the SDK instead." into gb-ub-photos-bryce
* commit '
659b19785a8673448e2939409f19fd39c8b63813':
Remove reference to local libraries. Make CameraTest build against the SDK instead.
Doris Liu [Fri, 15 Feb 2013 23:49:39 +0000 (23:49 +0000)]
am
6d0a2030: am
1fe1cc71: Merge "Fix memory leak in ComboPreferences" into gb-ub-photos-bryce
* commit '
6d0a2030c4bdd093880f1c3c9873f7fd049ed0dc':
Fix memory leak in ComboPreferences
OSDN Git Service
