OSDN Git Service
Baligh Uddin [Sun, 6 Jul 2014 21:41:51 +0000 (21:41 +0000)]
am
30d0576f: (-s ours) am
3fa82573: (-s ours) am
8fe98c70: (-s ours) Import translations. DO NOT MERGE
* commit '
30d0576f2a60b3a82cfeed6778dc60d763bfb654':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:34:53 +0000 (21:34 +0000)]
am
3fa82573: (-s ours) am
8fe98c70: (-s ours) Import translations. DO NOT MERGE
* commit '
3fa825732965bf71301fbf722c6388168d1df11e':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:30:24 +0000 (21:30 +0000)]
am
8d2d3d46: (-s ours) Import translations. DO NOT MERGE
* commit '
8d2d3d462f47c00c9520589f6b4755299fe3b1d9':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:28:16 +0000 (21:28 +0000)]
am
8fe98c70: (-s ours) Import translations. DO NOT MERGE
* commit '
8fe98c70253824cda07243e27f261e0b21ccb229':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 14:36:46 +0000 (07:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4c29d576ca2394a44f4a7aaa64ebff49b29568eb
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 14:36:10 +0000 (07:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifbbf8e0d7d2bdefd53ee28b487f311a6111ec7c0
Auto-generated-cl: translation import
Baligh Uddin [Thu, 26 Jun 2014 16:54:36 +0000 (16:54 +0000)]
am
612e3bb4: (-s ours) Import translations. DO NOT MERGE
* commit '
612e3bb4f83bd704fea44699dfa0f1c92a90efe4':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 25 Jun 2014 18:03:09 +0000 (11:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9bc970fb19fdcc612d48441d5221d70071600800
Auto-generated-cl: translation import
Narayan Kamath [Tue, 27 May 2014 11:10:12 +0000 (11:10 +0000)]
am
9cde04ed: am
53fd3c7c: Merge "Gallery2 : only build for 32-bit"
* commit '
9cde04ed08f3a5201a007d78b3c89f43fb3003e0':
Gallery2 : only build for 32-bit
Narayan Kamath [Tue, 27 May 2014 11:04:39 +0000 (11:04 +0000)]
am
53fd3c7c: Merge "Gallery2 : only build for 32-bit"
* commit '
53fd3c7cdf18c8f0ddc2dcc3954019bad34dd3fd':
Gallery2 : only build for 32-bit
Narayan Kamath [Tue, 27 May 2014 11:01:10 +0000 (11:01 +0000)]
Merge "Gallery2 : only build for 32-bit"
Andreas Gampe [Fri, 18 Apr 2014 22:50:07 +0000 (15:50 -0700)]
Gallery2 : only build for 32-bit
Gallery2 depends on librsjni, which currently only builds for arm,
mips and x86.
(cherry picked from commit
c9f714b65cdb05cef4797f30a42d006b80140aaf)
Change-Id: I7fd5363b453ca149bbd24e889f03a7bae6f4032e
Baligh Uddin [Thu, 22 May 2014 03:15:46 +0000 (03:15 +0000)]
am
87b440b9: (-s ours) Import translations. DO NOT MERGE
* commit '
87b440b9569367579de39a31d1c74e296ec4ade3':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 21 May 2014 22:07:48 +0000 (15:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia3395106bdcf93ef61c28b020dd1e70bee6dcc5e
Auto-generated-cl: translation import
Bill Yi [Wed, 30 Apr 2014 00:59:34 +0000 (00:59 +0000)]
Bill Yi [Tue, 29 Apr 2014 18:34:25 +0000 (11:34 -0700)]
Baligh Uddin [Wed, 23 Apr 2014 02:13:25 +0000 (02:13 +0000)]
am
04aee4fb: (-s ours) Import translations. DO NOT MERGE
* commit '
04aee4fb961356c3985b174ca4ac6cda15dc1c7e':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 01:09:27 +0000 (18:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6b0c460e717970999f2dcc5101130e02ba86fbd5
Auto-generated-cl: translation import
Alan Newberger [Tue, 22 Apr 2014 13:32:07 +0000 (13:32 +0000)]
am
3d736418: Merge "Use basic editor for sharpen filter."
* commit '
3d73641843682089be63cd248465497f007b93a1':
Use basic editor for sharpen filter.
Alan Newberger [Mon, 21 Apr 2014 23:13:26 +0000 (23:13 +0000)]
Merge "Use basic editor for sharpen filter."
Ying Wang [Sat, 19 Apr 2014 00:05:11 +0000 (00:05 +0000)]
am
6ad0c4ff: Merge "Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build."
* commit '
6ad0c4ffc3d50a6829a984c2ac37525680fc61eb':
Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build.
Ying Wang [Fri, 18 Apr 2014 23:56:22 +0000 (23:56 +0000)]
Merge "Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build."
Ying Wang [Fri, 18 Apr 2014 01:33:18 +0000 (18:33 -0700)]
Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build.
Change-Id: Id0a381ce06370347670ab9b324039ccc2222f93c
Narayan Kamath [Tue, 11 Mar 2014 18:42:23 +0000 (18:42 +0000)]
am
7a6bd46d: Merge "A couple of fixes"
* commit '
7a6bd46dc1a67e79afe1045877cf0115d43a6be8':
A couple of fixes
Narayan Kamath [Fri, 7 Mar 2014 16:11:19 +0000 (16:11 +0000)]
am
7a6bd46d: Merge "A couple of fixes"
* commit '
7a6bd46dc1a67e79afe1045877cf0115d43a6be8':
A couple of fixes
Narayan Kamath [Fri, 7 Mar 2014 15:31:27 +0000 (15:31 +0000)]
Merge "A couple of fixes"
Nick Kralevich [Fri, 7 Mar 2014 01:33:43 +0000 (01:33 +0000)]
am
e9c89c81: Merge "gallery: change typo \'&&\' to \'||\'"
* commit '
e9c89c814c97a74456ad1bf8d4c32a983663924c':
gallery: change typo '&&' to '||'
Kévin PETIT [Fri, 7 Feb 2014 16:43:56 +0000 (16:43 +0000)]
A couple of fixes
- using LDFLAGS doesn't pull the required dependencies, move
to using LOCAL_SHARED_LIBRARIES
- eliminate 'implicit declaration' warnings
Change-Id: I57f6feca6bfcf8b2e9d439462a33c9757cdde07d
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Jun Su [Sun, 23 Feb 2014 06:13:14 +0000 (14:13 +0800)]
Use basic editor for sharpen filter.
Currently gallery's sharpen filter is relate to the editor id =
R.id.imageShow, which is not point to any valid editor.
As a result native gallery sharpen function will cause exception and fail.
Change to use basic editor.
Change-Id: I2a04ab81c395e12004cd6fe4635932a19c1c39be
Baligh Uddin [Thu, 20 Feb 2014 21:21:47 +0000 (21:21 +0000)]
am
ddaf6e73: (-s ours) am
4ee527a4: (-s ours) am
36f05fbe: (-s ours) am
09fbf351: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
ddaf6e739041fb0cc65e08fe6866eb31e00dfae1':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 21:21:46 +0000 (21:21 +0000)]
am
f4b8d07b: (-s ours) am
e6e69360: (-s ours) am
7537e615: (-s ours) am
53851696: (-s ours) Import translations. DO NOT MERGE
* commit '
f4b8d07bbd26f024b24d31e5b2a53a8b759b1882':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 21:18:16 +0000 (21:18 +0000)]
am
4ee527a4: (-s ours) am
36f05fbe: (-s ours) am
09fbf351: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
4ee527a461f5b936e0c4471f2470440fcec086b1':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 21:18:16 +0000 (21:18 +0000)]
am
e6e69360: (-s ours) am
7537e615: (-s ours) am
53851696: (-s ours) Import translations. DO NOT MERGE
* commit '
e6e6936036a540b39dab6bcf8bdbfc294969f845':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 21:15:39 +0000 (21:15 +0000)]
am
36f05fbe: (-s ours) am
09fbf351: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
36f05fbe454b0d349a054091fcd7b51325ad2bc1':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 21:15:39 +0000 (21:15 +0000)]
am
7537e615: (-s ours) am
53851696: (-s ours) Import translations. DO NOT MERGE
* commit '
7537e615f921c1c5491ffc10c8fc76adf918defd':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 21:09:28 +0000 (21:09 +0000)]
am
09fbf351: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
09fbf3517a9be35e180f056ed0ffbc280e7c5087':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 21:09:27 +0000 (21:09 +0000)]
am
53851696: (-s ours) Import translations. DO NOT MERGE
* commit '
538516960287f12bc75cec07d37ea1e79083f039':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 21:06:57 +0000 (21:06 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 17:03:00 +0000 (09:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I46b2b3a5dd09ad1988250cff0b5c2724f29a4872
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Feb 2014 16:47:09 +0000 (08:47 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2b7221c550002cdb0fd9718d95bbd3fe5530f191
Auto-generated-cl: translation import
Nick Kralevich [Sat, 1 Feb 2014 01:41:23 +0000 (01:41 +0000)]
am
e9c89c81: Merge "gallery: change typo \'&&\' to \'||\'"
* commit '
e9c89c814c97a74456ad1bf8d4c32a983663924c':
gallery: change typo '&&' to '||'
Nick Kralevich [Sat, 1 Feb 2014 01:34:39 +0000 (01:34 +0000)]
Merge "gallery: change typo '&&' to '||'"
Leavitt Zhang [Tue, 28 Jan 2014 03:40:24 +0000 (11:40 +0800)]
gallery: change typo '&&' to '||'
Assertion to ckeck array boundary should
be '&&' instead of '||'. It caused an
Exception that '-1' wasn't detected.
Change-Id: I991ad8efed87a0837d262fe7419c7f007c173b56
Signed-off-by: Leavitt Zhang <leavittz@nvidia.com>
Baligh Uddin [Tue, 7 Jan 2014 05:50:10 +0000 (05:50 +0000)]
am
40719a33: (-s ours) am
7b6ac45d: (-s ours) am
7cbf5af8: (-s ours) am
e1f9ccbe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
40719a337093cca58885e16d6e0ae7f7da5fc7ad':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 05:50:09 +0000 (05:50 +0000)]
am
b54384cb: (-s ours) am
c862dd19: (-s ours) am
eba4fb66: (-s ours) am
e0659df8: (-s ours) Import translations. DO NOT MERGE
* commit '
b54384cb1dea088b1a6a1e71113a09995ea11b1e':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 05:46:15 +0000 (05:46 +0000)]
am
7b6ac45d: (-s ours) am
7cbf5af8: (-s ours) am
e1f9ccbe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
7b6ac45d984eab782d6d635da6e943cae4b76d44':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 05:46:15 +0000 (05:46 +0000)]
am
c862dd19: (-s ours) am
eba4fb66: (-s ours) am
e0659df8: (-s ours) Import translations. DO NOT MERGE
* commit '
c862dd192ba0225e3ff4908991de6240becb830e':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 05:13:55 +0000 (21:13 -0800)]
am
7cbf5af8: (-s ours) am
e1f9ccbe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
7cbf5af891b178523f5091baae4bfa5153cafa3e':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 05:13:54 +0000 (21:13 -0800)]
am
eba4fb66: (-s ours) am
e0659df8: (-s ours) Import translations. DO NOT MERGE
* commit '
eba4fb66c0bfb28f55185fc38da1e9a123f296c8':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 05:11:22 +0000 (21:11 -0800)]
am
e1f9ccbe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
e1f9ccbea957dc5f14a69de544a9f640ac829db5':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 05:11:22 +0000 (21:11 -0800)]
am
e0659df8: (-s ours) Import translations. DO NOT MERGE
* commit '
e0659df8ee4f0b098ae196523c46e45ccd8fd5ea':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 05:08:46 +0000 (05:08 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 7 Jan 2014 03:23:12 +0000 (19:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6bb582ef72de10b1e9e54548f219d8a900bdd2ca
Auto-generated-cl: translation import
Baligh Uddin [Tue, 7 Jan 2014 03:17:47 +0000 (19:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2bd761c654ca6b43089cd94fd7aee1bbe8c8c3de
Auto-generated-cl: translation import
Baligh Uddin [Thu, 19 Dec 2013 15:38:14 +0000 (15:38 +0000)]
am
de17ad28: (-s ours) am
f1d3a0fc: (-s ours) am
6f99876d: (-s ours) am
76310806: (-s ours) Import translations. DO NOT MERGE
* commit '
de17ad285b2ab025eb986017e1fd0bf636ce9ae9':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 15:33:00 +0000 (15:33 +0000)]
am
f1d3a0fc: (-s ours) am
6f99876d: (-s ours) am
76310806: (-s ours) Import translations. DO NOT MERGE
* commit '
f1d3a0fc08c827c47ed83c33e37be20c0733d3eb':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 15:30:02 +0000 (07:30 -0800)]
am
6f99876d: (-s ours) am
76310806: (-s ours) Import translations. DO NOT MERGE
* commit '
6f99876d81704fb03760584fa5b3f47620dcf54a':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 15:28:05 +0000 (07:28 -0800)]
am
76310806: (-s ours) Import translations. DO NOT MERGE
* commit '
76310806f0081c7991404de9c8a80e977cd0b1aa':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 06:44:35 +0000 (22:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I74fbdf2c0ea3817c249509449ccdf8d45aaa4f13
Auto-generated-cl: translation import
Baligh Uddin [Thu, 12 Dec 2013 16:56:03 +0000 (16:56 +0000)]
am
0abf7816: (-s ours) am
478e3183: (-s ours) am
63f898ac: (-s ours) am
299926e6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
0abf781635a2953a6dd8ffd8a57a84f65fcace5c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 16:56:02 +0000 (16:56 +0000)]
am
30728aca: (-s ours) am
6b51959c: (-s ours) am
f0ab16cf: (-s ours) am
b24fcaae: (-s ours) Import translations. DO NOT MERGE
* commit '
30728acaf53baf154f2d709e60686cfa58e5f99d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 16:48:13 +0000 (16:48 +0000)]
am
478e3183: (-s ours) am
63f898ac: (-s ours) am
299926e6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
478e318362e564c7a06dd3d16f315a4c5753ea45':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 16:48:12 +0000 (16:48 +0000)]
am
6b51959c: (-s ours) am
f0ab16cf: (-s ours) am
b24fcaae: (-s ours) Import translations. DO NOT MERGE
* commit '
6b51959c3ea54812e6cb2d9d213a59da62a99309':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 16:44:39 +0000 (08:44 -0800)]
am
63f898ac: (-s ours) am
299926e6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
63f898ac1117379b073de5ec40019d8c46acbf7c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 16:44:38 +0000 (08:44 -0800)]
am
f0ab16cf: (-s ours) am
b24fcaae: (-s ours) Import translations. DO NOT MERGE
* commit '
f0ab16cfebed98074e06a60cc1752f3dcfbb6870':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 16:40:40 +0000 (08:40 -0800)]
am
299926e6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
299926e60f4ac8ef3a228ca38ce45d290b69659b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 16:40:39 +0000 (08:40 -0800)]
am
b24fcaae: (-s ours) Import translations. DO NOT MERGE
* commit '
b24fcaae272f9219f96931feabe9887b91dbebab':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 15:48:25 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 12 Dec 2013 04:50:48 +0000 (20:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7baeb6a135280e6e3d924dbbb88b0bdeab70a158
Auto-generated-cl: translation import
Baligh Uddin [Thu, 12 Dec 2013 04:42:59 +0000 (20:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7bac9f63cb528615849b859fd1fef56f8a6977c0
Auto-generated-cl: translation import
Qiwen Zhao [Mon, 9 Dec 2013 22:20:45 +0000 (14:20 -0800)]
DO NOT MERGE reset to goog/klp-volantis-dev
Nick Kralevich [Fri, 6 Dec 2013 18:49:42 +0000 (10:49 -0800)]
am
044648be: am
062bd465: Merge "jni: fix C99 inline linking"
* commit '
044648be152a8914d68c4952dae2694dd43460da':
jni: fix C99 inline linking
Nick Kralevich [Fri, 6 Dec 2013 18:47:35 +0000 (10:47 -0800)]
am
062bd465: Merge "jni: fix C99 inline linking"
* commit '
062bd465cd25806ea37200639c6b1200a62db9d4':
jni: fix C99 inline linking
Nick Kralevich [Fri, 6 Dec 2013 18:45:24 +0000 (18:45 +0000)]
Merge "jni: fix C99 inline linking"
synergydev [Sun, 20 Oct 2013 23:34:58 +0000 (16:34 -0700)]
jni: fix C99 inline linking
Clang builds C code according to the C99 standard,
which provides different semantics for the inline
keyword than GCC's default behavior. This is the
correct behavior without any gnu extensions.
See here:
http://clang.llvm.org/compatibility.html#inline
Change-Id: I831a5189e027a2f0cb3c7d9cda56bd3701502863
The Android Open Source Project [Fri, 6 Dec 2013 01:26:52 +0000 (17:26 -0800)]
John Hoford [Thu, 5 Dec 2013 21:30:43 +0000 (21:30 +0000)]
am
9b57886d: am
c3606508: am
0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbad
* commit '
9b57886d0f6eba16a258cea1568a4c6d2ec4473c':
Stephen Hines [Thu, 5 Dec 2013 21:29:47 +0000 (21:29 +0000)]
am
d1b3e27b: (-s ours) am
4c89ec75: am
1b02bf12: (-s ours) DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.
* commit '
d1b3e27b8028ee1afcc3b34e8d7b7990849131bd':
Ying Wang [Thu, 5 Dec 2013 21:29:46 +0000 (21:29 +0000)]
Sascha Haeberling [Thu, 5 Dec 2013 21:29:42 +0000 (21:29 +0000)]
am
d3de4b79: am
c20802f0: Remove all the tests from Gallery2 until we have them sorted out.
* commit '
d3de4b7952021b8784d0215c59456595325c74fb':
Qiwen Zhao [Thu, 5 Dec 2013 21:29:04 +0000 (21:29 +0000)]
am
8073625e: Merge remote-tracking branch \'origin/klp-dev-plus-aosp\' into klp-dev-plus-aosp
* commit '
8073625ea47a0d1bea2f1d6046f8547b3b9a2e2e':
The Android Open Source Project [Thu, 5 Dec 2013 20:38:22 +0000 (12:38 -0800)]
The Android Open Source Project [Sat, 23 Nov 2013 01:48:03 +0000 (17:48 -0800)]
The Android Open Source Project [Fri, 22 Nov 2013 18:35:34 +0000 (10:35 -0800)]
Baligh Uddin [Fri, 22 Nov 2013 01:33:54 +0000 (17:33 -0800)]
am
07de1cf6: (-s ours) am
ded9ab3b: (-s ours) am
76ad19f1: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
07de1cf63102ef8f405c585e04b43366c40cc8d3':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Nov 2013 01:33:53 +0000 (17:33 -0800)]
am
4c8189fc: (-s ours) am
2a6118a6: (-s ours) am
daac361f: (-s ours) Import translations. DO NOT MERGE
* commit '
4c8189fcdd759710927e45ccf1686d8ea240eba0':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Nov 2013 01:30:10 +0000 (17:30 -0800)]
am
ded9ab3b: (-s ours) am
76ad19f1: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
ded9ab3b0dcf24cf0b269284b43eec7c53907e72':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Nov 2013 01:30:09 +0000 (17:30 -0800)]
am
2a6118a6: (-s ours) am
daac361f: (-s ours) Import translations. DO NOT MERGE
* commit '
2a6118a672846cafb816aeffa0a6ca6a4b291d81':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Nov 2013 01:23:50 +0000 (17:23 -0800)]
am
76ad19f1: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
76ad19f1c70df359d03ec0d2142805c263d39a01':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Nov 2013 01:23:49 +0000 (17:23 -0800)]
am
daac361f: (-s ours) Import translations. DO NOT MERGE
* commit '
daac361f913e0f148c63696020df5a6feb9461f6':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Nov 2013 01:20:43 +0000 (01:20 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Fri, 22 Nov 2013 00:44:11 +0000 (16:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I821f344b4a1b993dd1626c2f98d049a9f104493c
Auto-generated-cl: translation import
Baligh Uddin [Fri, 22 Nov 2013 00:42:19 +0000 (16:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I49f6e3ff0256e4c1649461f919beb7549e3bbe12
Auto-generated-cl: translation import
ztenghui [Tue, 19 Nov 2013 00:43:58 +0000 (16:43 -0800)]
am
91628475: am
947478b6: am
aa22947b: Fix the thumbnail generation.
* commit '
91628475ee8409e03f57a038c0bec3a830f462d6':
Fix the thumbnail generation.
ztenghui [Tue, 19 Nov 2013 00:40:41 +0000 (16:40 -0800)]
am
947478b6: am
aa22947b: Fix the thumbnail generation.
* commit '
947478b68e6aaf6ea5803c3c8fc06d58b6ba05f7':
Fix the thumbnail generation.
ztenghui [Tue, 19 Nov 2013 00:38:25 +0000 (16:38 -0800)]
am
aa22947b: Fix the thumbnail generation.
* commit '
aa22947b6f0714b73a78a28fb1217f7c5f4f663d':
Fix the thumbnail generation.
ztenghui [Tue, 19 Nov 2013 00:13:55 +0000 (16:13 -0800)]
Fix the thumbnail generation.
bug:
11664501
Change-Id: I53ec5a08e801d0300b8ed159158bc46f61c6d3f4
Baligh Uddin [Thu, 14 Nov 2013 04:59:14 +0000 (20:59 -0800)]
am
79dcd8f4: (-s ours) am
3715fb1f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
79dcd8f4ffa82895fea8975b8ae4b9da287ad8a9':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Nov 2013 04:59:14 +0000 (20:59 -0800)]
am
e98e7dbc: (-s ours) am
78db2b06: (-s ours) Import translations. DO NOT MERGE
* commit '
e98e7dbc9ad4d479c9d400f6260e00c5d6a35c3e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Nov 2013 04:54:58 +0000 (20:54 -0800)]
am
3715fb1f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
3715fb1f98ac84d0cb3f3211cfc5d3e6b051f6a4':
Import translations. DO NOT MERGE
OSDN Git Service
