OSDN Git Service
The Android Automerger [Tue, 6 Nov 2012 02:39:06 +0000 (18:39 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Mon, 5 Nov 2012 00:53:28 +0000 (16:53 -0800)]
am
954afb2e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
954afb2e42b9894676f0e7f9fb9b22d5bcf8825c':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 5 Nov 2012 00:50:29 +0000 (16:50 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
John Spurlock [Sun, 4 Nov 2012 00:14:28 +0000 (20:14 -0400)]
Fix the remaining black blip in secure camera transition.
Bug:
7452928
Change-Id: I3f8acd7304e7ff8423f8b1556ae7b0a55eb5a974
The Android Automerger [Sat, 3 Nov 2012 00:34:46 +0000 (17:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Bart Sears [Fri, 2 Nov 2012 22:38:18 +0000 (15:38 -0700)]
am
70fb3773: am
b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches
* commit '
70fb3773116bacdce3807a6ddfe386b43f4bbe80':
Lock icon in secure album should redirect to gallery after unlock.
Bart Sears [Fri, 2 Nov 2012 22:36:33 +0000 (15:36 -0700)]
am
b41864f1: 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
Baligh Uddin [Fri, 2 Nov 2012 14:23:46 +0000 (07:23 -0700)]
am
f350beb8: (-s ours) am
3252800c: (-s ours) Import translations. DO NOT MERGE
* commit '
f350beb8c64c38b959f27b9b917cdc58fe72868a':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 2 Nov 2012 14:21:55 +0000 (07:21 -0700)]
am
3252800c: (-s ours) Import translations. DO NOT MERGE
* commit '
3252800c7fe6bdb69b066eae0db739d06cfec64d':
Import translations. DO NOT MERGE
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:07:44 +0000 (22:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1a2c893513641927e8324619524c888b7eaa6738
Auto-generated-cl: translation import
Baligh Uddin [Fri, 2 Nov 2012 05:07:22 +0000 (22:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie49627da381e12e72468c31322d40bbc3915e7ec
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
The Android Automerger [Fri, 2 Nov 2012 02:05:35 +0000 (19:05 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
George Mount [Thu, 1 Nov 2012 20:41:41 +0000 (13:41 -0700)]
am
bd52f5e7: am
25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
* commit '
bd52f5e7f8e381b8e7f7d49cd88e5ba6cb46e8b2':
Fix extra gray item in secure album.
George Mount [Thu, 1 Nov 2012 20:39:45 +0000 (13:39 -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:02:24 +0000 (13:02 -0700)]
am
77262bd5: am
40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
* commit '
77262bd58f4aba9bdb961c7a9be856502e120fb8':
Jump to lockscreen in secure album if tap on video
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:56:48 +0000 (12:56 -0700)]
am
452ce867: am
769d38db: Fix tiny planet not using XMP metadata anymore
* commit '
452ce867e9d5837ede2e67d75fdaf07fb8ffcd57':
Fix tiny planet not using XMP metadata anymore
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
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
The Android Automerger [Thu, 1 Nov 2012 01:34:16 +0000 (18:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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:02:11 +0000 (15:02 -0700)]
am
8405f65e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
8405f65e8b3a671562ea215b06ae91512a4734d7':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 22:02:10 +0000 (15:02 -0700)]
am
f09fa2bf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
f09fa2bf45d92e0284212960d73080d825e39351':
Import translations. DO NOT MERGE
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:43:12 +0000 (09:43 -0700)]
am
692a8536: (-s ours) am
262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
692a8536b790d50c506a7fb9588301eaff5e02c6':
Import translations. DO NOT MERGE
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:40:20 +0000 (09:40 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
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:20:27 +0000 (09:20 -0700)]
am
a65e41a8: (-s ours) am
8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
a65e41a88601586f5bcdc31933bb677af4fab243':
Import translations. DO NOT MERGE
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:17:13 +0000 (09:17 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
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:50:02 +0000 (23:50 -0700)]
am
88cef187: am
471d8986: Add keyguard camera widget meta-data to gallery manifest.
* commit '
88cef187405439c515fc7c41a0fefe697736521f':
Add keyguard camera widget meta-data to gallery manifest.
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
The Android Automerger [Wed, 31 Oct 2012 03:12:31 +0000 (20:12 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mangesh Ghiware [Wed, 31 Oct 2012 00:40:54 +0000 (17:40 -0700)]
am
0514c285: am
589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem
* commit '
0514c285cca2116bb8d07f657cf9c167f87e8bad':
Change protection level for GALLERY_PROVIDER to signatureOrSystem
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:41 +0000 (17:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0f43283c17ede9f8ec48e6de2c9ed37e0d3e5476
Auto-generated-cl: translation import
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:18:03 +0000 (17:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id6447e91ba987395743e3018fe9c8574a4438874
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:21:55 +0000 (15:21 -0700)]
am
3245b90f: (-s ours) am
310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches
* commit '
3245b90f56edac635a3bcf7963d71a125d3b4312':
DO NOT MERGE: Do not set the background to null for video.
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:42:15 +0000 (12:42 -0700)]
am
3ac3cdd6: am
c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches
* commit '
3ac3cdd66f291e0e7400204f7410c02cffd24183':
Show sync error toast only when both loading and syncing are done.
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:36:58 +0000 (11:36 -0700)]
am
14a53420: am
aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches
* commit '
14a53420ee67fe971455d715af324266643ba0de':
Don't use an album for UriImages.
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
The Android Automerger [Tue, 30 Oct 2012 15:52:56 +0000 (08:52 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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:44:09 +0000 (14:44 -0700)]
am
1a2512cf: (-s ours) am
38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
1a2512cf1adf71c8a89e18eca40bef5bcc9fc451':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 21:44:07 +0000 (14:44 -0700)]
am
115299f0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
115299f04552f97b019c45f1625a24b2c49b7a17':
Import translations. DO NOT MERGE
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:40 +0000 (14:41 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
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
The Android Automerger [Mon, 29 Oct 2012 18:20:17 +0000 (11:20 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
nicolasroard [Mon, 29 Oct 2012 17:07:21 +0000 (10:07 -0700)]
am
b3e7d7d8: am
dc03ae14: Reset rotation flag
* commit '
b3e7d7d8abdb6ebb069cdc9a7206411ea53a8497':
Reset rotation flag
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:58:07 +0000 (08:58 -0700)]
am
ddc54044: am
98990049: Merge "Fix zooming position" into gb-ub-photos-arches
* commit '
ddc54044bfa994db4160442ff74b4ddf2e228681':
Fix zooming position
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:19:11 +0000 (08:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaf4585b3410dde61ed413bf4aaa59d3b6366be2b
Auto-generated-cl: translation import
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:35:05 +0000 (03:35 -0700)]
am
031a0741: am
17540e58: Do not copy XMP data if it has TinyPlanet filter
* commit '
031a07411e4ad53fe76c4ef6ed39d62dd429e406':
Do not copy XMP data if it has TinyPlanet filter
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
Baligh Uddin [Sun, 28 Oct 2012 23:46:51 +0000 (16:46 -0700)]
am
fbab7ba5: (-s ours) am
49af06e2: (-s ours) Import translations. DO NOT MERGE
* commit '
fbab7ba54617493dc47082b0bb16496eeedc1560':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 28 Oct 2012 23:46:50 +0000 (16:46 -0700)]
am
b3e89cab: (-s ours) Import translations. DO NOT MERGE
* commit '
b3e89cab1ee57cb1cef8a69b295ad4c15a7f3ebc':
Import translations. DO NOT MERGE
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:49:17 +0000 (08:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9993528e3b5b8b787499ddf730f84548884ba182
Auto-generated-cl: translation import
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:57:32 +0000 (20:57 -0700)]
am
5ac0bdab: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
5ac0bdabc6be6b411b001aeabcc5ae6702251925':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 28 Oct 2012 03:55:50 +0000 (20:55 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
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:54:04 +0000 (20:54 -0700)]
am
10f64ff1: (-s ours) am
798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
10f64ff122ed917a19776256eb995637d00881c0':
Import translations. DO NOT MERGE
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:49:32 +0000 (20:49 -0700)]
am
8275abe7: (-s ours) am
5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
8275abe7a2d71107087a111b527336068ed28f7e':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 28 Oct 2012 03:49:30 +0000 (20:49 -0700)]
am
1cf344e2: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
1cf344e2719c75f0590fd3ed13ec42820f97e29a':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 28 Oct 2012 03:48:12 +0000 (20:48 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
OSDN Git Service
