OSDN Git Service
Bart Sears [Thu, 1 Nov 2012 20:00:18 +0000 (13:00 -0700)]
am
40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
* commit '
40bb7158b8bda53433b36b94d6efed0e3937dcf2':
Jump to lockscreen in secure album if tap on video
Bart Sears [Thu, 1 Nov 2012 19:59:00 +0000 (12:59 -0700)]
Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
Sascha Haeberling [Thu, 1 Nov 2012 19:54:07 +0000 (12:54 -0700)]
am
769d38db: Fix tiny planet not using XMP metadata anymore
* commit '
769d38db5736cd690ab7837c0824572739c39184':
Fix tiny planet not using XMP metadata anymore
Angus Kong [Thu, 1 Nov 2012 07:08:44 +0000 (15:08 +0800)]
Jump to lockscreen in secure album if tap on video
bug:
7454356
Change-Id: I1e7e9ed886d414d5b41abdb1cc1d00c7736ae006
Sascha Haeberling [Thu, 1 Nov 2012 00:21:02 +0000 (17:21 -0700)]
Fix tiny planet not using XMP metadata anymore
Bug:
7452777
Background: Semantics of isPanoramaSafe has changed and should not be
called from within the TinyPlanet filter at all.
Change-Id: I6bada525d30d9ff21fdff99f52c6697c3f828c7e
Baligh Uddin [Wed, 31 Oct 2012 22:00:49 +0000 (15:00 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 31 Oct 2012 21:59:28 +0000 (14:59 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 31 Oct 2012 16:41:08 +0000 (09:41 -0700)]
am
262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
262c7bd76f21d440f2da3a4118c432987fcb8cdd':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 16:39:23 +0000 (09:39 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Wed, 31 Oct 2012 16:17:52 +0000 (09:17 -0700)]
am
8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
8d0392d623a88ace36fc4358c0d78e00377ca97f':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 16:16:19 +0000 (09:16 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Wu-cheng Li [Wed, 31 Oct 2012 06:47:17 +0000 (23:47 -0700)]
am
471d8986: Add keyguard camera widget meta-data to gallery manifest.
* commit '
471d898606bc15878b4d1708236f60157bab08df':
Add keyguard camera widget meta-data to gallery manifest.
Wu-cheng Li [Wed, 31 Oct 2012 03:12:05 +0000 (11:12 +0800)]
Add keyguard camera widget meta-data to gallery manifest.
bug:
7445471
Change-Id: I420ec1c44e32332d6e7f6023471f34f726fed264
Mangesh Ghiware [Wed, 31 Oct 2012 00:38:05 +0000 (17:38 -0700)]
am
589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem
* commit '
589381bffb30f4f4a84ebe59b9bc3a140153831c':
Change protection level for GALLERY_PROVIDER to signatureOrSystem
Baligh Uddin [Wed, 31 Oct 2012 00:22:09 +0000 (17:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I94a382290cc60de9ed982b1c8420cee050a4fabf
Auto-generated-cl: translation import
Baligh Uddin [Wed, 31 Oct 2012 00:20:20 +0000 (17:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0d62900eb18a8dfe8c0618c2010c4096208df848
Auto-generated-cl: translation import
Baligh Uddin [Wed, 31 Oct 2012 00:17:15 +0000 (17:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5a260559e229c2b2464e07f0194eb2a60f30b4c1
Auto-generated-cl: translation import
Baligh Uddin [Wed, 31 Oct 2012 00:14:41 +0000 (17:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I788d1bf735ea22a554941398f43c3684e3bb5a6e
Auto-generated-cl: translation import
Mangesh Ghiware [Tue, 30 Oct 2012 22:41:00 +0000 (15:41 -0700)]
Change protection level for GALLERY_PROVIDER to signatureOrSystem
Bug:
7433498
Change-Id: I1c5f43ab8b5f5974356b0a50c2d8b643591991b5
Tenghui Zhu [Tue, 30 Oct 2012 22:19:12 +0000 (15:19 -0700)]
am
310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches
* commit '
310db394adcdb8677b9a3d0f37a4abee63bdbb50':
DO NOT MERGE: Do not set the background to null for video.
Tenghui Zhu [Tue, 30 Oct 2012 22:16:33 +0000 (15:16 -0700)]
Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches
Romain Guy [Thu, 4 Oct 2012 01:47:21 +0000 (18:47 -0700)]
DO NOT MERGE: Do not set the background to null for video.
Bug #
7275145
Bug
7405595
Removing the window background when it's not visible is a good idea
to save on performance. Removing *all* the backgrounds is just a silly
idea that leads to weird looking results that drive graphics engineers
mad for a day until they figure out that everything is working properly
and that the app is simply asking the system to draw whatever garbage
is left in the GPU's graphics buffers.
Cherry pick the Romain's change from jb-mr1-dev:
https://googleplex-android-review.googlesource.com/#/c/234571/
Change-Id: Ief88821319989add5fda57ae7b69cdb01f6ccdf4
Bart Sears [Tue, 30 Oct 2012 19:40:36 +0000 (12:40 -0700)]
am
c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches
* commit '
c7536cfa819d10e0c556ecb30c53a58c048fa327':
Show sync error toast only when both loading and syncing are done.
Bart Sears [Tue, 30 Oct 2012 19:39:23 +0000 (12:39 -0700)]
Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches
George Mount [Tue, 30 Oct 2012 18:35:11 +0000 (11:35 -0700)]
am
aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches
* commit '
aa8228a42b25b60f0663770beea9acdce536f699':
Don't use an album for UriImages.
George Mount [Tue, 30 Oct 2012 18:33:21 +0000 (11:33 -0700)]
Merge "Don't use an album for UriImages." into gb-ub-photos-arches
Hung-ying Tyan [Tue, 30 Oct 2012 09:47:35 +0000 (17:47 +0800)]
Show sync error toast only when both loading and syncing are done.
Bug:
7427597
Change-Id: Ie1fe8510e2a2225424b3c2892b2c0a8b4021324c
George Mount [Mon, 29 Oct 2012 21:54:17 +0000 (14:54 -0700)]
Don't use an album for UriImages.
Bug
7422455
Change-Id: Ic9b0ae762b56f6734a1bd452c6c877431b90c0a6
Baligh Uddin [Mon, 29 Oct 2012 21:43:00 +0000 (14:43 -0700)]
am
38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
38c5d92c4a3659f3ae51a3b0f61bfb9eb2ed0043':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 21:41:26 +0000 (14:41 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 29 Oct 2012 21:40:36 +0000 (14:40 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
nicolasroard [Mon, 29 Oct 2012 17:05:20 +0000 (10:05 -0700)]
am
dc03ae14: Reset rotation flag
* commit '
dc03ae144d838714446b239f2b0c519d956af6ff':
Reset rotation flag
nicolasroard [Mon, 29 Oct 2012 16:35:47 +0000 (09:35 -0700)]
Reset rotation flag
bug:
7386221
Change-Id: I45a615a880a96d54bbde0a5ce648e02ff86db1de
nicolasroard [Mon, 29 Oct 2012 15:55:50 +0000 (08:55 -0700)]
am
98990049: Merge "Fix zooming position" into gb-ub-photos-arches
* commit '
98990049451cda3540f6cff1ae8065c3675ed3d8':
Fix zooming position
nicolasroard [Mon, 29 Oct 2012 15:53:16 +0000 (08:53 -0700)]
Merge "Fix zooming position" into gb-ub-photos-arches
Baligh Uddin [Mon, 29 Oct 2012 15:18:42 +0000 (08:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2bd22a0696bdcca4685ef89650155b4e4ebd33fa
Auto-generated-cl: translation import
Baligh Uddin [Mon, 29 Oct 2012 15:16:45 +0000 (08:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4c74eeda009683c4866e6d409d88c761fd3cd78c
Auto-generated-cl: translation import
John Hoford [Mon, 29 Oct 2012 10:32:59 +0000 (03:32 -0700)]
am
17540e58: Do not copy XMP data if it has TinyPlanet filter
* commit '
17540e58b8454e820a6273365cee94742d9b9900':
Do not copy XMP data if it has TinyPlanet filter
John Hoford [Mon, 29 Oct 2012 01:35:11 +0000 (18:35 -0700)]
Do not copy XMP data if it has TinyPlanet filter
bug:
7429072
Change-Id: I791db8ae8157741eb4cd74e9b6f749275b6b6cc3
nicolasroard [Fri, 26 Oct 2012 03:14:02 +0000 (20:14 -0700)]
Fix zooming position
bug:
7386221
Change-Id: I70215d3c3e12d08eee40a3cc848e3fc50f7dda75
Baligh Uddin [Sun, 28 Oct 2012 23:45:13 +0000 (16:45 -0700)]
am
49af06e2: (-s ours) Import translations. DO NOT MERGE
* commit '
49af06e229cdb52c4318dd6fd71d3c469fb5779a':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 28 Oct 2012 15:48:53 +0000 (08:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: If68f5b73d5e9f60c1ffbd07be3ca47314211dd6d
Auto-generated-cl: translation import
Baligh Uddin [Sun, 28 Oct 2012 15:47:33 +0000 (08:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6a988a9b70abe1fff8bd37eb377900aee6e8625e
Auto-generated-cl: translation import
Baligh Uddin [Sun, 28 Oct 2012 03:55:30 +0000 (20:55 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Sun, 28 Oct 2012 03:52:19 +0000 (20:52 -0700)]
am
798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
798ec54d6fbb9c847c3fa9f58129a9e7e57d82e3':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 28 Oct 2012 03:49:44 +0000 (20:49 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Sun, 28 Oct 2012 03:48:07 +0000 (20:48 -0700)]
am
5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
5583758af4174a627c35358218b61bf039cf5e74':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 28 Oct 2012 03:47:26 +0000 (20:47 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Sun, 28 Oct 2012 03:46:19 +0000 (20:46 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
nicolasroard [Sat, 27 Oct 2012 21:16:36 +0000 (14:16 -0700)]
am
2d2b69b0: Fix rounding issue affecting TinyPlanet
* commit '
2d2b69b0d86ad3131faf83164253a5255ff941ed':
Fix rounding issue affecting TinyPlanet
nicolasroard [Sat, 27 Oct 2012 17:54:18 +0000 (10:54 -0700)]
Fix rounding issue affecting TinyPlanet
bug:
7428061
Change-Id: Ieeb4c27d4c426d7052c49ca88ca61ff0785000a3
Nicolas Roard [Sat, 27 Oct 2012 01:14:49 +0000 (18:14 -0700)]
am
a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches
* commit '
a0fe81ade88cb631d068094bb8ec37a91810f45e':
Changed rotated display parameter increments to 90.
Nicolas Roard [Sat, 27 Oct 2012 01:14:48 +0000 (18:14 -0700)]
am
26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches
* commit '
26cfff70e559bcaf91c50def54f2a4e94d3dd50c':
change thumbnail and reset behaviour
Nicolas Roard [Sat, 27 Oct 2012 00:39:48 +0000 (17:39 -0700)]
Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches
Nicolas Roard [Sat, 27 Oct 2012 00:39:29 +0000 (17:39 -0700)]
Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches
Doris Liu [Sat, 27 Oct 2012 00:32:35 +0000 (17:32 -0700)]
am
591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches
* commit '
591974bceb89bccf3376a7c424017e847eca61df':
Show panoViewer icon after "Back" from viewer
Doris Liu [Sat, 27 Oct 2012 00:30:01 +0000 (17:30 -0700)]
Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches
Doris Liu [Sat, 27 Oct 2012 00:17:17 +0000 (17:17 -0700)]
Show panoViewer icon after "Back" from viewer
Bug:
7407942
Change-Id: I00da3c73a558e412e106f089034e83f2e75616e4
George Mount [Fri, 26 Oct 2012 23:46:14 +0000 (16:46 -0700)]
am
b6d49492: Remove black borders in Manta LightCycle capture after orientation change.
* commit '
b6d494925ea14a02ef75f58d5d969d7586914ef7':
Remove black borders in Manta LightCycle capture after orientation change.
John Hoford [Fri, 26 Oct 2012 23:03:23 +0000 (16:03 -0700)]
change thumbnail and reset behaviour
bug:
7386757
bug:
7343047
Change-Id: I0b44309f047b790025fb806ce041e2265489f027
George Mount [Wed, 24 Oct 2012 22:07:50 +0000 (15:07 -0700)]
Remove black borders in Manta LightCycle capture after orientation change.
Bug
7344906
Change-Id: I70017e4479962d49aedb06ea7b050f638e00fc06
Bobby Georgescu [Fri, 26 Oct 2012 22:19:39 +0000 (15:19 -0700)]
am
88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches
* commit '
88870365af146d05162742c5f613fc92483b0a93':
Fix the black lines near edge of thumbnails
Bobby Georgescu [Fri, 26 Oct 2012 22:11:25 +0000 (15:11 -0700)]
Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches
Ruben Brunk [Fri, 26 Oct 2012 20:48:09 +0000 (13:48 -0700)]
Changed rotated display parameter increments to 90.
Bug:
7393432
Change-Id: Id94a28c88cc06a7d99aab0d01dae4fc59cefbab2
John Reck [Fri, 26 Oct 2012 17:04:45 +0000 (10:04 -0700)]
am
10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches
* commit '
10f975a628badbb400a97872c6704740ef936e46':
Add proxy launcher
John Reck [Fri, 26 Oct 2012 17:03:05 +0000 (10:03 -0700)]
Merge "Add proxy launcher" into gb-ub-photos-arches
Bobby Georgescu [Fri, 26 Oct 2012 12:01:07 +0000 (05:01 -0700)]
am
798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches
* commit '
798f4a914d47e69496374051fab386a3536c9698':
Hold WakeLock for batch delete operation
Bobby Georgescu [Fri, 26 Oct 2012 11:59:23 +0000 (04:59 -0700)]
Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches
Owen Lin [Fri, 26 Oct 2012 10:55:49 +0000 (18:55 +0800)]
Fix the black lines near edge of thumbnails
1. Correct the positions of right and bottom borders
2. Turn off blending by using PoterDuffMode.SRC
bug:
7414307
Change-Id: Icc6fd765c2b1e904308c53aa66b55600e0016471
Baligh Uddin [Fri, 26 Oct 2012 08:30:32 +0000 (01:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2bafd4427f86c8ceec724e5f6752c95a50bf2380
Auto-generated-cl: translation import
Baligh Uddin [Fri, 26 Oct 2012 08:28:35 +0000 (01:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I310c1025f3ef9b3c69fe070f7ed022850d6764dc
Auto-generated-cl: translation import
Baligh Uddin [Fri, 26 Oct 2012 08:25:39 +0000 (01:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8771039e735893f4aa0fab53074fa093d7cd21c1
Auto-generated-cl: translation import
Baligh Uddin [Fri, 26 Oct 2012 08:23:25 +0000 (01:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3a988dd5df9fc1251d3df571f37742ed6b4ad345
Auto-generated-cl: translation import
nicolasroard [Fri, 26 Oct 2012 07:52:54 +0000 (00:52 -0700)]
am
8d8cdf7f: Fix colors in rotate and mirror
* commit '
8d8cdf7f67db69309fd740ca301fbeaadac8a9f0':
Fix colors in rotate and mirror
nicolasroard [Fri, 26 Oct 2012 07:02:18 +0000 (00:02 -0700)]
Fix colors in rotate and mirror
bug:
7419025
Change-Id: Icf92de032f62f93a3ac57e042ea582c760d9f600
nicolasroard [Fri, 26 Oct 2012 06:42:14 +0000 (23:42 -0700)]
am
8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches
* commit '
8b3ce9b01275151b653ea138324e47eb66a7b47e':
Fix crash when showing history
nicolasroard [Fri, 26 Oct 2012 06:41:00 +0000 (23:41 -0700)]
Merge "Fix crash when showing history" into gb-ub-photos-arches
nicolasroard [Fri, 26 Oct 2012 06:27:32 +0000 (23:27 -0700)]
Fix crash when showing history
bug:
7418823
Change-Id: I0a84bb4d8fc8b42fc953f8301bb2b24cf64edce7
Hung-ying Tyan [Fri, 26 Oct 2012 04:18:46 +0000 (21:18 -0700)]
am
635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches
* commit '
635aab5631e25488610ff5546c51ea2895dda2f0':
Fix tiling effect when open a photo.
Hung-ying Tyan [Fri, 26 Oct 2012 04:17:12 +0000 (21:17 -0700)]
Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches
Nicolas Roard [Fri, 26 Oct 2012 02:23:20 +0000 (19:23 -0700)]
am
24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches
* commit '
24f28850adcb14a1de87e538f60f3bb309bed284':
Do not add crop into preset if in inital setup
Nicolas Roard [Fri, 26 Oct 2012 02:21:45 +0000 (19:21 -0700)]
Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches
Bobby Georgescu [Thu, 25 Oct 2012 21:55:55 +0000 (14:55 -0700)]
Hold WakeLock for batch delete operation
Bug:
6680729
Change-Id: I0bdd59edb60c746c8c9e3c3608be980247f0d91a
John Hoford [Fri, 26 Oct 2012 01:38:51 +0000 (18:38 -0700)]
Do not add crop into preset if in inital setup
bug:
7417545
Change-Id: I355936645e555e3d6b950923af301b437570dd93
John Reck [Wed, 24 Oct 2012 18:11:51 +0000 (11:11 -0700)]
Add proxy launcher
Bug:
7394901
Change-Id: I667a6e6fbd11d4c02dc536067bb6f3813775db9c
John Reck [Fri, 26 Oct 2012 00:50:45 +0000 (17:50 -0700)]
am
6106c833: Merge "Add loading spinner" into gb-ub-photos-arches
* commit '
6106c833161cf8e64fc6a9580116f11f4a02d98b':
Add loading spinner
John Reck [Fri, 26 Oct 2012 00:49:27 +0000 (17:49 -0700)]
Merge "Add loading spinner" into gb-ub-photos-arches
Mangesh Ghiware [Fri, 26 Oct 2012 00:47:30 +0000 (17:47 -0700)]
am
5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches
* commit '
5388677d3078f2c218d22465c955e3df6b2ffbed':
Handle 360 panorama specific MIME type.
Mangesh Ghiware [Fri, 26 Oct 2012 00:44:54 +0000 (17:44 -0700)]
Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches
John Reck [Thu, 25 Oct 2012 17:08:37 +0000 (10:08 -0700)]
Add loading spinner
Bug:
7408575
Change-Id: Ia737b36abb88d75381f41c25474e3cc03448dbb9
Mangesh Ghiware [Wed, 10 Oct 2012 22:56:29 +0000 (15:56 -0700)]
Handle 360 panorama specific MIME type.
Bug:
7407448
Change-Id: I939a061e2100c2cdc17279982de98f1d446d8aef
Ruben Brunk [Fri, 26 Oct 2012 00:00:58 +0000 (17:00 -0700)]
am
4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches
* commit '
4164fabf5f9324adde9954130aad13c2f72aa24a':
Fix issue where aspect bounds don't get applied.
Ruben Brunk [Fri, 26 Oct 2012 00:00:57 +0000 (17:00 -0700)]
am
d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches
* commit '
d72971e683069d463c78117037414e5286689549':
Fixed crop intent.
Ruben Brunk [Fri, 26 Oct 2012 00:00:20 +0000 (17:00 -0700)]
Merge "Fix issue where aspect bounds don't get applied." into gb-ub-photos-arches
Ruben Brunk [Thu, 25 Oct 2012 23:59:41 +0000 (16:59 -0700)]
Merge "Fixed crop intent." into gb-ub-photos-arches
Ruben Brunk [Thu, 25 Oct 2012 01:24:34 +0000 (18:24 -0700)]
Fix issue where aspect bounds don't get applied.
Bug:
7407937
Change-Id: Ie6484d6458657d6284e04de755a8cc1a912dfb6c
Ruben Brunk [Thu, 25 Oct 2012 22:53:42 +0000 (15:53 -0700)]
Fixed crop intent.
Bug:
7415140
Bug:
7403813
Change-Id: I545162544f845d210d21185cddaca09b219fb091
Ruben Brunk [Thu, 25 Oct 2012 22:11:16 +0000 (15:11 -0700)]
am
15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches
* commit '
15aff7c3b27e2938cea3734cb350671386d210c7':
Tagged strings in XML with translation info.
Ruben Brunk [Thu, 25 Oct 2012 22:09:23 +0000 (15:09 -0700)]
Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches
Michael Jurka [Thu, 25 Oct 2012 20:17:33 +0000 (13:17 -0700)]
Fix conflict with other build fix
Change-Id: Id5286ee8d335b6307f6602e933364f462f19bff2
OSDN Git Service
