OSDN Git Service
Hung-ying Tyan [Tue, 13 Nov 2012 06:15:28 +0000 (22:15 -0800)]
Merge "Parse the layer of exiftool output" into gb-ub-photos-bryce
Hung-ying Tyan [Tue, 13 Nov 2012 06:15:04 +0000 (22:15 -0800)]
Merge "Exiftool parser" into gb-ub-photos-bryce
Doris Liu [Mon, 12 Nov 2012 23:17:36 +0000 (15:17 -0800)]
Fix UnsupportedOperationException in MediaObject
Bug:
6495745
Change-Id: I770833f0c3fec6f187e961f511a7d9d2591f5f97
Baligh Uddin [Fri, 9 Nov 2012 22:19:27 +0000 (14:19 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 9 Nov 2012 14:52:00 +0000 (06:52 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib83d4034adb61835865c308210daeb7767128583
Auto-generated-cl: translation import
Baligh Uddin [Fri, 9 Nov 2012 14:48:48 +0000 (06:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: I02bfb14ad6bc12c5628b9152e0720f6a65588da8
Auto-generated-cl: translation import
Earl Ou [Wed, 7 Nov 2012 09:56:11 +0000 (17:56 +0800)]
Convenient function to add timestamp related exif tags
Change-Id: I8a20c38d5fd35517d0520b29aac362eff32cbdd9
Earl Ou [Wed, 7 Nov 2012 07:28:48 +0000 (15:28 +0800)]
use ExifParser to parse the orientaion
Change-Id: I47171c028cbc1f94b7de5d067de0636a9e241fbb
Earl Ou [Wed, 24 Oct 2012 05:09:39 +0000 (13:09 +0800)]
Handle wrong thumbnail tag type
Change-Id: If41834f0aa86425a06aaede815f3e0c3cdd17fd9
Earl Ou [Wed, 24 Oct 2012 02:44:03 +0000 (10:44 +0800)]
Handle undefined tags and ignore copyright tag in exif test
Change-Id: I531518555257bdaefb79b681282c6aad07542b4b
Earl Ou [Fri, 19 Oct 2012 15:27:44 +0000 (23:27 +0800)]
Handle invalid offset value in ExifParser
Change-Id: I6d4a0edec361f8359535761d7f12ab9363ff1ad1
Earl Ou [Fri, 19 Oct 2012 12:23:28 +0000 (20:23 +0800)]
ignore image with invalid thumbnail type in Exif test
Change-Id: I6fc3a2dde4caf881b3b63aa95f1997ee9ccd4dbc
Earl Ou [Fri, 19 Oct 2012 12:08:13 +0000 (20:08 +0800)]
Handle tag not found in ExifParserTest
Change-Id: I892336ff3f73f91f5ac45ab9868f4ecfa61051ac
Earl Ou [Wed, 24 Oct 2012 01:46:29 +0000 (09:46 +0800)]
fix OOM in exif test
Change-Id: I41831e5831b2081f9b6bef6e57bd914faa41385b
Baligh Uddin [Wed, 7 Nov 2012 00:06:28 +0000 (16:06 -0800)]
am
85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
85d20a07d6412f453e7956c105ff8f8548094186':
Import translations. DO NOT MERGE
Bobby Georgescu [Wed, 7 Nov 2012 00:06:26 +0000 (16:06 -0800)]
am
9ec5de9d: Fix scenario where launching Gallery launches Camera
* commit '
9ec5de9dbf46caecd2f0b38a72d31fa37ecb0466':
Fix scenario where launching Gallery launches Camera
Baligh Uddin [Tue, 6 Nov 2012 22:37:44 +0000 (14:37 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Tue, 6 Nov 2012 19:57:33 +0000 (11:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2150a9c0fa87324b32fbf8139caea8d13ab57a70
Auto-generated-cl: translation import
Baligh Uddin [Tue, 6 Nov 2012 19:56:55 +0000 (11:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8d3e81b4f27c10ad7b24ada7d7bb066f45dd29c5
Auto-generated-cl: translation import
Bobby Georgescu [Tue, 6 Nov 2012 05:21:55 +0000 (21:21 -0800)]
Fix scenario where launching Gallery launches Camera
Bug:
7479102
Change-Id: Ib4676a7149c659897eee1dbbb92ab09861bd0ed4
Bobby Georgescu [Mon, 5 Nov 2012 22:12:51 +0000 (14:12 -0800)]
Split PhotoPage into FilmstripPage and SinglePhotoPage
Bug:
7479348
Change-Id: I98f668bd00e2e09bda9d5d9965fdbdaf1b832bfa
Bobby Georgescu [Mon, 5 Nov 2012 21:31:42 +0000 (13:31 -0800)]
Load correct localized album names after language change
Bug:
7459805
Change-Id: I484ffea5b07488ffdda2e265c4efa32a3333ea03
Doris Liu [Mon, 5 Nov 2012 21:09:52 +0000 (13:09 -0800)]
Adding AccessibilityUtils class
Bug:
7434841
All the functions in this class should be backward compatible to
gingerbread.
Change-Id: I280a64d195b2df123607a5cdad5886e3048dbb92
Doris Liu [Sat, 3 Nov 2012 01:22:07 +0000 (18:22 -0700)]
Add API check for method announceForAccessibility
Bug:
7434841
Change-Id: Ib97a322b4cdb1e1ca81d6ffa092e40f5ae172cb4
Bart Sears [Fri, 2 Nov 2012 23:27:30 +0000 (16:27 -0700)]
am
b41864f1: (-s ours) Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches
* commit '
b41864f13b83a4f2d92f601b2e4381762ad1effa':
Lock icon in secure album should redirect to gallery after unlock.
Bart Sears [Fri, 2 Nov 2012 22:34:01 +0000 (15:34 -0700)]
Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches
Angus Kong [Fri, 2 Nov 2012 17:38:26 +0000 (10:38 -0700)]
Merge "Don't use activatedBackgroundIndicator under API 14" into gb-ub-photos-bryce
Baligh Uddin [Fri, 2 Nov 2012 14:22:18 +0000 (07:22 -0700)]
am
3252800c: (-s ours) Import translations. DO NOT MERGE
* commit '
3252800c7fe6bdb69b066eae0db739d06cfec64d':
Import translations. DO NOT MERGE
Angus Kong [Fri, 2 Nov 2012 08:53:22 +0000 (16:53 +0800)]
Don't use activatedBackgroundIndicator under API 14
bug:
7460473
Change-Id: I5d46302e13dfda04f72128329ecea147913ea8d8
Wu-cheng Li [Fri, 2 Nov 2012 05:36:07 +0000 (13:36 +0800)]
Lock icon in secure album should redirect to gallery after unlock.
Use FLAG_DISMISS_KEYGUARD so lock screen will be brought up
when launching gallery.
bug:
7462572
Change-Id: I345398cc6cfc09901e1ce8309ebdb65cf15088e0
Baligh Uddin [Fri, 2 Nov 2012 05:06:42 +0000 (22:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie16eccac5661ad587f8edc0508b356bc1f16a11b
Auto-generated-cl: translation import
Baligh Uddin [Fri, 2 Nov 2012 05:06:20 +0000 (22:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iee5cfc87f61245753889d1cc83f9c9a511449bbe
Auto-generated-cl: translation import
George Mount [Thu, 1 Nov 2012 20:40:01 +0000 (13:40 -0700)]
am
25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
* commit '
25fab8057e0db4b1ff33b8da13b270d9af8ae217':
Fix extra gray item in secure album.
George Mount [Thu, 1 Nov 2012 20:37:54 +0000 (13:37 -0700)]
Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
Bart Sears [Thu, 1 Nov 2012 20:00:41 +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:31 +0000 (12:54 -0700)]
am
769d38db: Fix tiny planet not using XMP metadata anymore
* commit '
769d38db5736cd690ab7837c0824572739c39184':
Fix tiny planet not using XMP metadata anymore
George Mount [Thu, 1 Nov 2012 17:40:22 +0000 (10:40 -0700)]
Fix extra gray item in secure album.
Bug
7454444
Change-Id: I83f40e7e74f658a7b9ada148932a231ef8c31f73
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
Bobby Georgescu [Wed, 31 Oct 2012 23:33:56 +0000 (16:33 -0700)]
Use the system-standard long press vibration pattern
Bug:
7216819
Change-Id: I575868583777a7a953d767d0cdaa91a439d908ff
Doris Liu [Wed, 31 Oct 2012 23:25:23 +0000 (16:25 -0700)]
Disable operations when no item is selected
Bug:
7441208
Change-Id: I2f435ad8aa0b578ecfec426f7ad6287f0f210f48
Bobby Georgescu [Wed, 31 Oct 2012 22:12:57 +0000 (15:12 -0700)]
Merge "Fix jank on videoplayer auto-exit" into gb-ub-photos-bryce
John Reck [Wed, 31 Oct 2012 22:10:18 +0000 (15:10 -0700)]
Merge "Gingerbread support-ish" into gb-ub-photos-bryce
John Reck [Wed, 31 Oct 2012 00:34:20 +0000 (17:34 -0700)]
Gingerbread support-ish
This reverts commit
1336062985c9824d7fd796b1cebd5eaa8e4163ca.
Change-Id: I718ec56315dc207a3e612abb4576bddab9afa2ee
Bobby Georgescu [Wed, 31 Oct 2012 21:59:59 +0000 (14:59 -0700)]
Fix jank on videoplayer auto-exit
Bug:
7344292
Change-Id: I3af95d3370769a6465644fa4aabe3f2ffa2980e7
Baligh Uddin [Wed, 31 Oct 2012 16:40:39 +0000 (09:40 -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:39 +0000 (09:39 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
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:18:19 +0000 (09:18 -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:37 +0000 (09:16 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 31 Oct 2012 16:16:19 +0000 (09:16 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Hung-ying Tyan [Wed, 31 Oct 2012 06:55:13 +0000 (23:55 -0700)]
Merge "Handle invalid data type in ExifParser" into gb-ub-photos-bryce
Hung-ying Tyan [Wed, 31 Oct 2012 06:54:12 +0000 (23:54 -0700)]
Merge "Handle images with multile APP1 in ExifParser" into gb-ub-photos-bryce
Hung-ying Tyan [Wed, 31 Oct 2012 06:53:27 +0000 (23:53 -0700)]
Merge "Handle the last null byte in Exif tag." into gb-ub-photos-bryce
Earl Ou [Fri, 19 Oct 2012 10:30:01 +0000 (18:30 +0800)]
Handle invalid data type in ExifParser
Change-Id: I547021c03ec9e5d53c7452926c2ca5b6bf11dc43
Earl Ou [Fri, 19 Oct 2012 09:41:16 +0000 (17:41 +0800)]
Handle images with multile APP1 in ExifParser
Change-Id: If88384066b008bc6a68976b6e291cc1dbcd65914
Earl Ou [Fri, 19 Oct 2012 08:50:34 +0000 (16:50 +0800)]
Handle the last null byte in Exif tag.
Change-Id: Ic802810d11518dfeb80d1338db65b2e1e1cc8476
Wu-cheng Li [Wed, 31 Oct 2012 06:47:13 +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
Earl Ou [Thu, 18 Oct 2012 11:14:16 +0000 (19:14 +0800)]
Do not use UTF-8 to decode string in ExifOutputStream
Change-Id: Id0303a9e8a72db1625e8d0f7487be44227b0ce6a
Earl Ou [Fri, 19 Oct 2012 08:49:34 +0000 (16:49 +0800)]
print image path when setup error in Exif test
Change-Id: Ia4391571695ea518eac53f2b8c6b1a2acb5159c1
Mangesh Ghiware [Wed, 31 Oct 2012 00:38:11 +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:20:48 +0000 (17:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I781515fc164ea84a6e30d96612724b0dcb10a8f7
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:15:23 +0000 (17:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibf40bc990f7f5e8d0ed266141a3fc75825f6e864
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:34 +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:54 +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.
Teng-Hui Zhu [Tue, 30 Oct 2012 18:33:47 +0000 (11:33 -0700)]
Merge "Gallery: Do not set the background to null for video." into gb-ub-photos-bryce
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
Teng-Hui Zhu [Fri, 26 Oct 2012 22:26:36 +0000 (15:26 -0700)]
Gallery: Do not set the background to null for video.
This will fix screen corruption when exit while video complete or rotate while
video playing.
bug:
7405595
Change-Id: I8b559390a284e5c850bc02a76add86c4de600144
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:42:26 +0000 (14:42 -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:40:57 +0000 (14:40 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Mon, 29 Oct 2012 21:40:36 +0000 (14:40 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Doris Liu [Mon, 29 Oct 2012 20:11:10 +0000 (13:11 -0700)]
Disable save button when there's no modification
Bug:
7353884
Change-Id: I1b88e8b8ab3a92aad1226c60062a17a2f4badfb9
nicolasroard [Mon, 29 Oct 2012 17:05:48 +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:06 +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:17:19 +0000 (08:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icc56fac50486b6af23e8ea9f44e015849fa16c84
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:32 +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:44:35 +0000 (16:44 -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:01 +0000 (08:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0511f6ab875fed7dd83db188a74993bd57131c6f
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:51:26 +0000 (20:51 -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:50:00 +0000 (20:50 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
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:14 +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:46:55 +0000 (20:46 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce