OSDN Git Service
Marco Nelissen [Wed, 6 Feb 2013 23:35:52 +0000 (15:35 -0800)]
Don't call requestLayout from onLayout
Doing a layout within a layout can lead to various problems, so it should
be avoided. There's some logging that warns of this, which got triggered
by CommonControllerOverlay.
I don't know what problem this code was originally trying to solve, but it
doesn't seem to be necessary anymore. The line in question was originally
introduced in change
209a9163d4e8cee0bfe162ae598ef40e6051479c, in Oct 2011.
Change-Id: I1402a842df59df31b69ad981337ea1c8630103df
nicolasroard [Thu, 31 Jan 2013 00:01:44 +0000 (16:01 -0800)]
am
27f14ec6: Merge "Clean up invalidate / redraw loop Move the recopy to the main thread" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '
27f14ec6ff7565d96f6c838e7417a25c15beade3':
Clean up invalidate / redraw loop Move the recopy to the main thread
nicolasroard [Wed, 30 Jan 2013 23:54:29 +0000 (23:54 +0000)]
Merge "Clean up invalidate / redraw loop Move the recopy to the main thread" into gb-ub-photos-bryce
nicolasroard [Tue, 29 Jan 2013 21:57:42 +0000 (13:57 -0800)]
Clean up invalidate / redraw loop
Move the recopy to the main thread
Change-Id: I8c94179e292f5679b7c817b6bd5000ee384b83ce
Michael Kolb [Tue, 29 Jan 2013 23:25:57 +0000 (15:25 -0800)]
am
0d0ec194: Merge "Copy camera resources into Gallery2" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Michael Kolb (1)
* commit '
0d0ec194f3a73267ad29fc7627b1f445bca77338':
Copy camera resources into Gallery2
Michael Kolb [Tue, 29 Jan 2013 23:24:34 +0000 (23:24 +0000)]
Merge "Copy camera resources into Gallery2" into gb-ub-photos-bryce
Michael Kolb [Tue, 29 Jan 2013 22:03:06 +0000 (14:03 -0800)]
Copy camera resources into Gallery2
Change-Id: I3be2758b2ddca31dbc2f21457a62664310c39684
John Reck [Tue, 29 Jan 2013 22:55:31 +0000 (14:55 -0800)]
am
e606b862: Extract constants/boilerplate
# Via John Reck
* commit '
e606b862f26ba9e499db4f15940f8200841b9dc3':
Extract constants/boilerplate
John Reck [Tue, 29 Jan 2013 21:55:57 +0000 (13:55 -0800)]
Extract constants/boilerplate
Change-Id: I52ba51bab6ec12f2925384c1eedbba96e02bfa97
nicolasroard [Tue, 29 Jan 2013 21:47:16 +0000 (13:47 -0800)]
am
4588a3cb: Merge "Fix thumbnail generation" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '
4588a3cb75457f98b6b0fd1b7dc41e9db2079b16':
Fix thumbnail generation
nicolasroard [Tue, 29 Jan 2013 21:41:51 +0000 (21:41 +0000)]
Merge "Fix thumbnail generation" into gb-ub-photos-bryce
Bobby Georgescu [Tue, 29 Jan 2013 21:40:05 +0000 (13:40 -0800)]
am
2da45514: Merge "Importer: when view is reused for same image, don\'t reload" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Bobby Georgescu (1)
* commit '
2da455143a4cb59d289f24c23b8f93c29da14fd0':
Importer: when view is reused for same image, don't reload
Bobby Georgescu [Tue, 29 Jan 2013 21:38:34 +0000 (21:38 +0000)]
Merge "Importer: when view is reused for same image, don't reload" into gb-ub-photos-bryce
nicolasroard [Tue, 29 Jan 2013 21:37:33 +0000 (13:37 -0800)]
Fix thumbnail generation
Change-Id: I03a290bf8eb80bd1687bfd37640dec29ef213cdb
Bobby Georgescu [Tue, 29 Jan 2013 21:30:12 +0000 (13:30 -0800)]
Importer: when view is reused for same image, don't reload
Bug:
7968780
Change-Id: I6786d140e516ff60562c5c0b1222fca0ea153216
nicolasroard [Tue, 29 Jan 2013 21:24:55 +0000 (13:24 -0800)]
am
7bbdf56b: Merge "Fix scaling + quality parameters" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '
7bbdf56b74ec0ba029b1fc5f0d96cf8e8c1e7618':
Fix scaling + quality parameters
nicolasroard [Tue, 29 Jan 2013 21:23:46 +0000 (21:23 +0000)]
Merge "Fix scaling + quality parameters" into gb-ub-photos-bryce
nicolasroard [Tue, 29 Jan 2013 21:16:21 +0000 (13:16 -0800)]
Fix scaling + quality parameters
Change-Id: I92e7759282e0f3cc7be8ff95a19a4acb890d214d
Michael Kolb [Tue, 29 Jan 2013 20:54:23 +0000 (12:54 -0800)]
am
b17796f3: Merge "Move Camera Java/Native source into Gallery2" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Michael Kolb (1)
* commit '
b17796f30a1b9cdde29f5b0e338c482ba447a4b1':
Move Camera Java/Native source into Gallery2
Michael Kolb [Tue, 29 Jan 2013 20:51:56 +0000 (20:51 +0000)]
Merge "Move Camera Java/Native source into Gallery2" into gb-ub-photos-bryce
Bobby Georgescu [Tue, 29 Jan 2013 19:17:48 +0000 (11:17 -0800)]
am
b380f174: Add comment about MenuExecutor assumptions in BatchService
# Via Bobby Georgescu
* commit '
b380f17426f419e3663da80985dc62f544d47048':
Add comment about MenuExecutor assumptions in BatchService
Bobby Georgescu [Tue, 29 Jan 2013 18:58:34 +0000 (10:58 -0800)]
Add comment about MenuExecutor assumptions in BatchService
Bug:
7998915
Change-Id: Ibb73585bf2f81b4a1daadfeb814828ec7b55441d
Michael Kolb [Tue, 29 Jan 2013 18:33:22 +0000 (10:33 -0800)]
Move Camera Java/Native source into Gallery2
Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1
John Reck [Tue, 29 Jan 2013 01:37:01 +0000 (17:37 -0800)]
am
d0f8807c: Merge "Launching gallery shows browse ui on canvas" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and John Reck (1)
* commit '
d0f8807ca66b006e4049e32ad187a808c42e1f00':
Launching gallery shows browse ui on canvas
John Reck [Tue, 29 Jan 2013 01:35:38 +0000 (01:35 +0000)]
Merge "Launching gallery shows browse ui on canvas" into gb-ub-photos-bryce
Ruben Brunk [Tue, 29 Jan 2013 00:56:43 +0000 (16:56 -0800)]
am
2251adcd: Merge "Fixed BasicEditor NPE." into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Ruben Brunk (1)
* commit '
2251adcd841d597eb6673fc6d2810979753ceb73':
Fixed BasicEditor NPE.
Ruben Brunk [Tue, 29 Jan 2013 00:54:58 +0000 (00:54 +0000)]
Merge "Fixed BasicEditor NPE." into gb-ub-photos-bryce
Bobby Georgescu [Tue, 29 Jan 2013 00:53:32 +0000 (16:53 -0800)]
am
7805371b: Merge "Fix ANRs due to waiting for IO on UI thread" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Bobby Georgescu (1)
* commit '
7805371bbe17bca129bfd1902f23227b27312854':
Fix ANRs due to waiting for IO on UI thread
Bobby Georgescu [Tue, 29 Jan 2013 00:51:51 +0000 (00:51 +0000)]
Merge "Fix ANRs due to waiting for IO on UI thread" into gb-ub-photos-bryce
nicolasroard [Tue, 29 Jan 2013 00:51:22 +0000 (16:51 -0800)]
am
3a67b242: Fix apply geometry.
# Via nicolasroard
* commit '
3a67b242889f81d3a124de7a9763a6ca72bc5194':
Fix apply geometry.
nicolasroard [Tue, 29 Jan 2013 00:46:12 +0000 (16:46 -0800)]
Fix apply geometry.
bug:
8068166
Change-Id: I3cfa44dda1af1fbd5455db6027d793b5a44dd5d8
John Reck [Tue, 29 Jan 2013 00:38:47 +0000 (16:38 -0800)]
Launching gallery shows browse ui on canvas
Change-Id: I3a5e63ce354ac8e3f3c60e4dc86cfa4432026622
Ruben Brunk [Tue, 29 Jan 2013 00:30:26 +0000 (16:30 -0800)]
Fixed BasicEditor NPE.
Bug:
8068020
Change-Id: I81df163d9779ae3e246f4e337b64dfbc32ce7db5
Bobby Georgescu [Tue, 29 Jan 2013 00:16:44 +0000 (16:16 -0800)]
Fix ANRs due to waiting for IO on UI thread
Bug:
7998915
Change-Id: I938145a7072170f713099a04578f98951b35cbab
John Reck [Mon, 28 Jan 2013 21:45:31 +0000 (13:45 -0800)]
am
ca593b02: Code drop
# Via John Reck
* commit '
ca593b02ab6a3054f625878621ee5117953f7385':
Code drop
John Reck [Mon, 28 Jan 2013 21:35:56 +0000 (13:35 -0800)]
Code drop
Change-Id: Ibee7c3a1aed61dbe9d3d62ad7f3d3653994c8ef8
Baligh Uddin [Mon, 28 Jan 2013 18:51:08 +0000 (10:51 -0800)]
am
c1bbc208: (-s ours) Import translations. DO NOT MERGE
# Via Baligh Uddin
* commit '
c1bbc208d1bc3541ca7ae6816de244fe7cec865c':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 28 Jan 2013 16:59:39 +0000 (08:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9d2f2471d62cbfdd11c9d3e6d9107fbc46fad3dd
Auto-generated-cl: translation import
Baligh Uddin [Wed, 23 Jan 2013 22:38:32 +0000 (14:38 -0800)]
am
0f19e0af: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit '
0f19e0af5bffb88436912a1028f6dd8851f4e511':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Jan 2013 22:36:36 +0000 (22:36 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 23 Jan 2013 22:36:04 +0000 (22:36 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 23 Jan 2013 19:53:57 +0000 (11:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id21114e4e1d6fe10171bf094fe3031ccbef1cb52
Auto-generated-cl: translation import
Baligh Uddin [Wed, 23 Jan 2013 19:53:27 +0000 (11:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id76648ccbbb45ea8d7ab7a759cd07bce5feb35ca
Auto-generated-cl: translation import
Stephen Hines [Wed, 23 Jan 2013 18:42:11 +0000 (10:42 -0800)]
am
24063430: Revert "Switch Gallery over to RS compatibility library."
* commit '
240634303ac2368ab0faa19a8f8f4687cac5fc1e':
Revert "Switch Gallery over to RS compatibility library."
Stephen Hines [Wed, 23 Jan 2013 18:38:42 +0000 (18:38 +0000)]
Revert "Switch Gallery over to RS compatibility library."
This reverts commit
0746ce0977cde616d25ce35fee0d8d554235a21c
Change-Id: Ic0fb6c60e5f40b53ad032afeafe2f9ff70c26b50
Stephen Hines [Wed, 23 Jan 2013 18:24:51 +0000 (10:24 -0800)]
am
0746ce09: Switch Gallery over to RS compatibility library.
* commit '
0746ce0977cde616d25ce35fee0d8d554235a21c':
Switch Gallery over to RS compatibility library.
Stephen Hines [Thu, 17 Jan 2013 01:54:08 +0000 (17:54 -0800)]
Switch Gallery over to RS compatibility library.
Change-Id: If6eaea15a12a1448b402fb00dfd770b3749471ad
Baligh Uddin [Wed, 23 Jan 2013 01:05:37 +0000 (17:05 -0800)]
am
b49e4804: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
b49e480479c71ed1906ee00423e8c44c7224da91':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Jan 2013 01:03:24 +0000 (01:03 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 23 Jan 2013 01:03:13 +0000 (01:03 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
nicolasroard [Wed, 23 Jan 2013 00:32:01 +0000 (16:32 -0800)]
am
57eedfd9: Better caching for RS filters
* commit '
57eedfd99676913f575b1f76e3a874026d1ddf7c':
Better caching for RS filters
nicolasroard [Wed, 16 Jan 2013 03:57:49 +0000 (19:57 -0800)]
Better caching for RS filters
Change-Id: I78eaa90e408059cf1c59fc06920f5aef82ae2c0d
Baligh Uddin [Tue, 22 Jan 2013 17:43:31 +0000 (09:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie9461e3c4beb1404f2421bb7ce10131e9f4cb907
Auto-generated-cl: translation import
Baligh Uddin [Tue, 22 Jan 2013 17:42:53 +0000 (09:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8a59ba2c18264af55063a5c3bf5ba6b7edec00cc
Auto-generated-cl: translation import
John Reck [Sat, 19 Jan 2013 00:47:21 +0000 (16:47 -0800)]
am
191ed025: Merge "Tweaks for canvas" into gb-ub-photos-bryce
* commit '
191ed02506583bab787adb9baef60f50f7661b3a':
Tweaks for canvas
John Reck [Sat, 19 Jan 2013 00:45:14 +0000 (00:45 +0000)]
Merge "Tweaks for canvas" into gb-ub-photos-bryce
John Hoford [Sat, 19 Jan 2013 00:05:37 +0000 (16:05 -0800)]
am
9c00ee21: Merge "refactor the filter/editor relationship" into gb-ub-photos-bryce
* commit '
9c00ee2117b103e159d5f58f8d1e31b3db5a205d':
refactor the filter/editor relationship
John Reck [Sat, 19 Jan 2013 00:00:45 +0000 (16:00 -0800)]
Tweaks for canvas
Change-Id: I9aecf757047f93159212441e5317ef2b3b304a70
John Hoford [Fri, 18 Jan 2013 23:56:51 +0000 (23:56 +0000)]
Merge "refactor the filter/editor relationship" into gb-ub-photos-bryce
John Hoford [Fri, 18 Jan 2013 16:59:35 +0000 (08:59 -0800)]
refactor the filter/editor relationship
Change-Id: I1f9a735166c28c65734fbb85201774fb6f664076
Bobby Georgescu [Fri, 18 Jan 2013 21:22:30 +0000 (13:22 -0800)]
am
5a1adfcb: Fix importer crashes on unplug during scrolling
* commit '
5a1adfcb2d9a6a7402989d152dd3443f48c321dd':
Fix importer crashes on unplug during scrolling
Bobby Georgescu [Fri, 18 Jan 2013 20:47:56 +0000 (12:47 -0800)]
Fix importer crashes on unplug during scrolling
Bug:
8035040
Change-Id: If822b15f2210e2af42c8a38f6ac2acb25d535aa9
Bobby Georgescu [Fri, 18 Jan 2013 01:34:49 +0000 (17:34 -0800)]
am
eebf9e81: Fix importer crashes when unplugging during indexing
* commit '
eebf9e81673150a6c4fec89b64e3cdb595377c83':
Fix importer crashes when unplugging during indexing
Bobby Georgescu [Fri, 18 Jan 2013 01:26:36 +0000 (17:26 -0800)]
am
48e37632: Merge "Show status in importer for empty or no device" into gb-ub-photos-bryce
* commit '
48e376325d812fdbdcee569b48641cd4073e4973':
Show status in importer for empty or no device
Bobby Georgescu [Thu, 17 Jan 2013 22:07:31 +0000 (14:07 -0800)]
Fix importer crashes when unplugging during indexing
Bug:
8027984
Slightly refactored the indexing step to encapsulate all
of the indexing work within the runnable that does it and
to correctly handle the cases where the device is unplugged
in the middle of the indexing.
Change-Id: I338657bbbedd6b82d012f65cd1ea28e0afd890c2
Bobby Georgescu [Fri, 18 Jan 2013 01:12:40 +0000 (01:12 +0000)]
Merge "Show status in importer for empty or no device" into gb-ub-photos-bryce
Bobby Georgescu [Thu, 17 Jan 2013 20:30:06 +0000 (12:30 -0800)]
Show status in importer for empty or no device
Bug:
8000251
Change-Id: Iefbbe6df59f432ffeb10ac9fa846a8908584ab58
Baligh Uddin [Thu, 17 Jan 2013 21:42:52 +0000 (13:42 -0800)]
am
bb4ae131: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
bb4ae131edc0b1b2bedd82785a40f682e646170b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Jan 2013 21:42:51 +0000 (13:42 -0800)]
am
497ef949: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
497ef94976db4326d7844dccf0f4a6d179a6283a':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Jan 2013 21:39:49 +0000 (21:39 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Thu, 17 Jan 2013 21:39:37 +0000 (21:39 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Jan 2013 21:39:17 +0000 (21:39 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Jan 2013 21:38:33 +0000 (21:38 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
John Reck [Thu, 17 Jan 2013 02:11:10 +0000 (18:11 -0800)]
am
b1cabf78: Merge "New loading model" into gb-ub-photos-bryce
* commit '
b1cabf78e719ef8c40dad44eee38b9884e8f9258':
New loading model
John Reck [Thu, 17 Jan 2013 02:09:08 +0000 (02:09 +0000)]
Merge "New loading model" into gb-ub-photos-bryce
John Reck [Wed, 16 Jan 2013 22:10:30 +0000 (14:10 -0800)]
New loading model
Rename reload() to loadIfDirty()
loadIfDirty is implemented by MediaSet and is final
loadIfDirty is now blocking instead of async
Subclasses must implement two protected methods, isDirtyLocked() and load()
The change from async reload() to sync loadIfDirty() should be fine since
all users of reload() were doing so from a background thread already, and the
longest load() is PicasaAlbumSet which is still a fairly brisk 40ms or so
Change-Id: If5cc596a1c13e52e5f4efff1a144bd086d37cfb7
Angus Kong [Thu, 17 Jan 2013 01:00:17 +0000 (17:00 -0800)]
am
9874da2d: Add image/webp type to intent filter
* commit '
9874da2d750d7547b9bb5b1bbc6721b68133ab22':
Add image/webp type to intent filter
Angus Kong [Wed, 16 Jan 2013 23:52:32 +0000 (15:52 -0800)]
Add image/webp type to intent filter
bug:
8012543
Change-Id: I0ebd2941c5508d169855864165e93e2ea1dacf81
Bobby Georgescu [Wed, 16 Jan 2013 22:40:21 +0000 (14:40 -0800)]
am
e4130faa: Merge "Always have determinate progress in import notification" into gb-ub-photos-bryce
* commit '
e4130faa8418fef36fc022891e0b215ce714f5d1':
Always have determinate progress in import notification
Bobby Georgescu [Wed, 16 Jan 2013 22:39:01 +0000 (22:39 +0000)]
Merge "Always have determinate progress in import notification" into gb-ub-photos-bryce
Bobby Georgescu [Wed, 16 Jan 2013 22:15:49 +0000 (14:15 -0800)]
Always have determinate progress in import notification
Bug:
7967520
Change-Id: Iaeb5f2e3d508d964856faaea63475cbc25e13c0d
John Reck [Wed, 16 Jan 2013 22:12:00 +0000 (14:12 -0800)]
am
48d4284a: Merge "Add a blocking load to MediaSet" into gb-ub-photos-bryce
* commit '
48d4284a9ce804ba00b22e587a8b3d27ef9928c1':
Add a blocking load to MediaSet
John Reck [Wed, 16 Jan 2013 22:09:45 +0000 (22:09 +0000)]
Merge "Add a blocking load to MediaSet" into gb-ub-photos-bryce
Bobby Georgescu [Wed, 16 Jan 2013 21:48:44 +0000 (13:48 -0800)]
am
f63e1f7a: Importer date tiles reflect language change
* commit '
f63e1f7ab9a4f4a97909564cfc5975cbac66872f':
Importer date tiles reflect language change
Bobby Georgescu [Wed, 16 Jan 2013 21:22:37 +0000 (13:22 -0800)]
Importer date tiles reflect language change
Bug:
8020035
Change-Id: I1ac2a27ca7be088e6ad6f9b8c624c36e04ff03b0
Baligh Uddin [Wed, 16 Jan 2013 19:49:03 +0000 (11:49 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0b71c1c1470a29b67358d8998a6f41bfde12c219
Auto-generated-cl: translation import
Baligh Uddin [Wed, 16 Jan 2013 19:48:32 +0000 (11:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic353210ead354b4da42c0f7500e7fed2a4cf174c
Auto-generated-cl: translation import
Baligh Uddin [Wed, 16 Jan 2013 19:47:59 +0000 (11:47 -0800)]
Import translations. DO NOT MERGE
Change-Id: I70a0b256ef0605ccd76731e9cb5898e27574086d
Auto-generated-cl: translation import
Baligh Uddin [Wed, 16 Jan 2013 19:47:12 +0000 (11:47 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icf6bf3b0c6563577b4e33f41252f18923caed6c3
Auto-generated-cl: translation import
John Reck [Wed, 16 Jan 2013 01:50:39 +0000 (17:50 -0800)]
Add a blocking load to MediaSet
Change-Id: I367975fd33f884fb7e576b7064c495bdb7a3ce7b
Ruben Brunk [Wed, 16 Jan 2013 18:29:17 +0000 (10:29 -0800)]
am
aeb7d79d: Fix exif data saving for picasa images.
* commit '
aeb7d79d2a35f534276bc6bf8128349f9768ae6b':
Fix exif data saving for picasa images.
Ruben Brunk [Wed, 16 Jan 2013 01:23:40 +0000 (17:23 -0800)]
Fix exif data saving for picasa images.
Bug:
7910836
Change-Id: I8ec1a1ab379c35b0602689a8f7850f5c861e0189
John Hoford [Tue, 15 Jan 2013 23:07:46 +0000 (15:07 -0800)]
am
63a7dac0: refactoring imageshow
* commit '
63a7dac01d394523799939596b960cb03321798d':
refactoring imageshow
John Hoford [Mon, 14 Jan 2013 22:48:39 +0000 (14:48 -0800)]
refactoring imageshow
Change-Id: I6d0872250b31a427ea6a3e46bd1c9ca5f3ba92ee
Baligh Uddin [Tue, 15 Jan 2013 17:37:18 +0000 (09:37 -0800)]
am
a4eee492: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
a4eee4927777ebeb81641ad9b95719578cb5df1d':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 15 Jan 2013 17:11:35 +0000 (09:11 -0800)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 15 Jan 2013 15:24:01 +0000 (07:24 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Tue, 15 Jan 2013 00:43:16 +0000 (16:43 -0800)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 15 Jan 2013 00:41:43 +0000 (16:41 -0800)]
am
8a9b7eb0: (-s ours) Import translations. DO NOT MERGE
* commit '
8a9b7eb08d3a7bb8a48b2d555f7f565b8c6ba21c':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 14 Jan 2013 23:44:06 +0000 (15:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I373830f3a76a373ba1b4e01938939d53e4791c27
Auto-generated-cl: translation import
OSDN Git Service
