git.osdn.net Git - android-x86/packages-apps-Gallery2.git/log

Geoff Mendal [Mon, 17 Mar 2014 20:08:46 +0000 (13:08 -0700)]

Import translations. DO NOT MERGE

Change-Id: If4b6291e04fd1f341b21e9e73e5bf33a590ee155
Auto-generated-cl: translation import

commit | commitdiff | tree

Narayan Kamath [Fri, 7 Mar 2014 20:15:48 +0000 (20:15 +0000)]

am 6b0afa7e: am 36e3fb8d: am 7a6bd46d: Merge "A couple of fixes"

* commit '6b0afa7eecaa2e4faff5b12218af692a363d3d53':
A couple of fixes

commit | commitdiff | tree

Narayan Kamath [Fri, 7 Mar 2014 16:14:24 +0000 (16:14 +0000)]

am 36e3fb8d: am 7a6bd46d: Merge "A couple of fixes"

* commit '36e3fb8dafd0523538f14ced00d7c97a05398841':
A couple of fixes

commit | commitdiff | tree

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

commit | commitdiff | tree

Narayan Kamath [Fri, 7 Mar 2014 15:31:27 +0000 (15:31 +0000)]

Merge "A couple of fixes"

commit | commitdiff | tree

Baligh Uddin [Wed, 5 Mar 2014 21:28:00 +0000 (13:28 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ie133b487d8874abc3beb7eb7d039c8a537f8dd6b
Auto-generated-cl: translation import

commit | commitdiff | tree

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>

commit | commitdiff | tree

Baligh Uddin [Mon, 3 Mar 2014 20:56:55 +0000 (12:56 -0800)]

Import translations. DO NOT MERGE

Change-Id: I1d239ee0a0045a55efa3a1c0937044289b73a7e6
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Wed, 26 Feb 2014 20:36:23 +0000 (12:36 -0800)]

Import translations. DO NOT MERGE

Change-Id: I886d5d53729ce3fff852ff264445739b2f2e4124
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Mon, 24 Feb 2014 21:47:07 +0000 (13:47 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ib3bdeab2f4ab5c2d1c2841e0d0c2e8755e93078b
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Thu, 20 Feb 2014 23:15:48 +0000 (23:15 +0000)]

am e219163b: (-s ours) am d75a08be: (-s ours) 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 'e219163b32edea8bbde6cdf990ed5a141496c693':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 20 Feb 2014 23:15:47 +0000 (23:15 +0000)]

am 77a5fec0: (-s ours) am 035598eb: (-s ours) am f4b8d07b: (-s ours) am e6e69360: (-s ours) am 7537e615: (-s ours) am 53851696: (-s ours) Import translations. DO NOT MERGE

* commit '77a5fec019c5241500df41a3b1f6371a6f9bb976':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 20 Feb 2014 21:24:50 +0000 (21:24 +0000)]

am d75a08be: (-s ours) 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 'd75a08beada678f0202c69f50e031359e77a43a8':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 20 Feb 2014 21:24:50 +0000 (21:24 +0000)]

am 035598eb: (-s ours) am f4b8d07b: (-s ours) am e6e69360: (-s ours) am 7537e615: (-s ours) am 53851696: (-s ours) Import translations. DO NOT MERGE

* commit '035598eb1710e9282d54a3d17f5646525ebbbcad':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Thu, 20 Feb 2014 21:06:57 +0000 (21:06 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Wed, 12 Feb 2014 21:10:49 +0000 (13:10 -0800)]

Import translations. DO NOT MERGE

Change-Id: I1dc2a0e8d7c6d6936d442ffa96c57181e229cff6
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Tue, 4 Feb 2014 00:29:20 +0000 (16:29 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ib863bc959f74222ae7d613ff477c10c8cf592315
Auto-generated-cl: translation import

commit | commitdiff | tree

Nick Kralevich [Sat, 1 Feb 2014 01:47:28 +0000 (01:47 +0000)]

am 902bda39: am e9c89c81: Merge "gallery: change typo \'&&\' to \'||\'"

* commit '902bda398b9589492571f64ae4575fdbd62a095a':
gallery: change typo '&&' to '||'

commit | commitdiff | tree

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 '||'

commit | commitdiff | tree

Nick Kralevich [Sat, 1 Feb 2014 01:34:39 +0000 (01:34 +0000)]

Merge "gallery: change typo '&&' to '||'"

commit | commitdiff | tree

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>

commit | commitdiff | tree

Baligh Uddin [Thu, 9 Jan 2014 04:08:03 +0000 (04:08 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Wed, 8 Jan 2014 19:35:25 +0000 (11:35 -0800)]

Import translations. DO NOT MERGE

Change-Id: I581c7a962ceeb36b0f6ba01ea45c9af4f5d98b59
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Wed, 8 Jan 2014 19:32:53 +0000 (11:32 -0800)]

Import translations. DO NOT MERGE

Change-Id: I3e5fb0a2f4fdf627a94d784cacfe233d8df85a28
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Tue, 7 Jan 2014 05:53:55 +0000 (05:53 +0000)]

am 9aa4e966: (-s ours) 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 '9aa4e966fbe95afa53f70ca88c92c8e30ec0f9df':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 7 Jan 2014 05:53:54 +0000 (05:53 +0000)]

am dfafc43c: (-s ours) am b54384cb: (-s ours) am c862dd19: (-s ours) am eba4fb66: (-s ours) am e0659df8: (-s ours) Import translations. DO NOT MERGE

* commit 'dfafc43c7851aff228ebdcdaac2266636d76d3c3':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Tue, 7 Jan 2014 05:08:46 +0000 (05:08 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Tue, 7 Jan 2014 05:08:46 +0000 (05:08 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-dev

commit | commitdiff | tree

Baligh Uddin [Tue, 7 Jan 2014 05:08:46 +0000 (05:08 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Tue, 7 Jan 2014 03:23:45 +0000 (19:23 -0800)]

Import translations. DO NOT MERGE

Change-Id: If30592a82b656d946bd5d6dcb973124e048ea1ce
Auto-generated-cl: translation import

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Tue, 7 Jan 2014 03:18:28 +0000 (19:18 -0800)]

Import translations. DO NOT MERGE

Change-Id: I58bea313f77ea1223b3062e36fb323a5e0095542
Auto-generated-cl: translation import

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Thu, 19 Dec 2013 15:40:49 +0000 (15:40 +0000)]

am 8f1dc691: (-s ours) am de17ad28: (-s ours) am f1d3a0fc: (-s ours) am 6f99876d: (-s ours) am 76310806: (-s ours) Import translations. DO NOT MERGE

* commit '8f1dc6917c774a9c6c3d3589a0c40f3b4a593a07':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Mon, 16 Dec 2013 21:05:18 +0000 (13:05 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ic126312189d71a0276334a6d40d2f07efc78b524
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Thu, 12 Dec 2013 17:12:34 +0000 (17:12 +0000)]

am 5db6533c: (-s ours) 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 '5db6533c75aa9fc0ee6e6107996f0ad453d65a61':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 12 Dec 2013 17:12:33 +0000 (17:12 +0000)]

am 1ece6f7f: (-s ours) am 30728aca: (-s ours) am 6b51959c: (-s ours) am f0ab16cf: (-s ours) am b24fcaae: (-s ours) Import translations. DO NOT MERGE

* commit '1ece6f7f6555e82ba9f0ea352e5aec954189f667':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Thu, 12 Dec 2013 15:48:25 +0000 (15:48 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Qiwen Zhao [Tue, 10 Dec 2013 18:47:20 +0000 (18:47 +0000)]

am b6245828: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev

* commit 'b6245828b58bb54fd0aa3b6b02398e5b10a5b85e':

commit | commitdiff | tree

Baligh Uddin [Mon, 9 Dec 2013 21:55:15 +0000 (13:55 -0800)]

Remove deprecated locales

Bug:11340849

Change-Id: I2a6d6b7a8f6cf94df3bc875d58a0409571d368bd

commit | commitdiff | tree

Qiwen Zhao [Mon, 9 Dec 2013 22:20:45 +0000 (14:20 -0800)]

DO NOT MERGE reset to goog/klp-volantis-dev

commit | commitdiff | tree

Baligh Uddin [Mon, 9 Dec 2013 20:10:14 +0000 (12:10 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ifade8d653a3569a6ce2763be5f7029998491dd3f
Auto-generated-cl: translation import

commit | commitdiff | tree

Nick Kralevich [Fri, 6 Dec 2013 18:55:57 +0000 (18:55 +0000)]

am 7f72f47a: am 044648be: am 062bd465: Merge "jni: fix C99 inline linking"

* commit '7f72f47a7d814aade99badb62d69c86b4bd58fd2':
jni: fix C99 inline linking

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Nick Kralevich [Fri, 6 Dec 2013 18:45:24 +0000 (18:45 +0000)]

Merge "jni: fix C99 inline linking"

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Open Source Project [Fri, 6 Dec 2013 01:43:31 +0000 (01:43 +0000)]

am 73fd37e6: am bb23e198: Merge commit \'38ef95e0802868a39ab33bcb279e20a21ec41fd8\' into HEAD

* commit '73fd37e6da2e6606895e6ef90cea54ee5331b88d':

commit | commitdiff | tree

The Android Open Source Project [Fri, 6 Dec 2013 01:26:52 +0000 (17:26 -0800)]

am bb23e198: Merge commit \'38ef95e0802868a39ab33bcb279e20a21ec41fd8\' into HEAD

* commit 'bb23e198873a6e63c34b52fe3d1f12d3e5d13a2c':

commit | commitdiff | tree

John Hoford [Thu, 5 Dec 2013 22:51:57 +0000 (22:51 +0000)]

am ee6ecb1d: (-s ours) am 9b57886d: am c3606508: am 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbad

* commit 'ee6ecb1d59a6a4e7c1363cb867cafd4f1b9342f5':

commit | commitdiff | tree

Stephen Hines [Thu, 5 Dec 2013 22:51:56 +0000 (22:51 +0000)]

am e09fbdf1: (-s ours) am d1b3e27b: (-s ours) am 4c89ec75: am 1b02bf12: (-s ours) DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.

* commit 'e09fbdf13f1170bc51ee51538c339973762f61ec':

commit | commitdiff | tree

Ying Wang [Thu, 5 Dec 2013 22:51:55 +0000 (22:51 +0000)]

am d1c056e1: (-s ours) am 3984ba77: am 366c2ed3: Remove the unused libcutils.

* commit 'd1c056e13f28362aa9ba996e102443cd96934cf5':

commit | commitdiff | tree

Sascha Haeberling [Thu, 5 Dec 2013 22:51:54 +0000 (22:51 +0000)]

am d777da4d: (-s ours) am d3de4b79: am c20802f0: Remove all the tests from Gallery2 until we have them sorted out.

* commit 'd777da4d09c5c73c5f1d971f697c51313f802900':

commit | commitdiff | tree

Qiwen Zhao [Thu, 5 Dec 2013 22:51:53 +0000 (22:51 +0000)]

am 21ba70c2: (-s ours) am 8073625e: Merge remote-tracking branch \'origin/klp-dev-plus-aosp\' into klp-dev-plus-aosp

* commit '21ba70c26659413256882d3e97015bf12477607d':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Ying Wang [Thu, 5 Dec 2013 21:29:46 +0000 (21:29 +0000)]

am 3984ba77: am 366c2ed3: Remove the unused libcutils.

* commit '3984ba7795f511b88bb990f1adb552ea5f4097ce':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

The Android Open Source Project [Thu, 5 Dec 2013 20:38:22 +0000 (12:38 -0800)]

Merge commit '38ef95e0802868a39ab33bcb279e20a21ec41fd8' into HEAD

commit | commitdiff | tree

Geoff Mendal [Wed, 4 Dec 2013 21:47:08 +0000 (13:47 -0800)]

Import translations. DO NOT MERGE

Change-Id: I38c6af50377b6ec50ba06ad88ef387a732d7062d
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Mon, 25 Nov 2013 21:05:31 +0000 (21:05 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 25 Nov 2013 19:58:35 +0000 (11:58 -0800)]

Import translations. DO NOT MERGE

Change-Id: I2d51831dd01bbe19ca2a62bfb3b70d851211e56a
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Mon, 25 Nov 2013 19:55:36 +0000 (11:55 -0800)]

Import translations. DO NOT MERGE

Change-Id: I44566d0c1c20c824d13e3e721eebccfc5f877691
Auto-generated-cl: translation import

commit | commitdiff | tree

The Android Open Source Project [Sat, 23 Nov 2013 20:29:46 +0000 (12:29 -0800)]

am 3a24397e: am b269d503: Merge commit \'289306f103b181378d5d58850cf61495facc3204\' into HEAD

* commit '3a24397e5c948c3c77cf0c1d86259d0997305f8b':

commit | commitdiff | tree

The Android Open Source Project [Sat, 23 Nov 2013 01:48:03 +0000 (17:48 -0800)]

am b269d503: Merge commit \'289306f103b181378d5d58850cf61495facc3204\' into HEAD

* commit 'b269d503712d9f214297ef7dcf5991745626b675':

commit | commitdiff | tree

The Android Open Source Project [Fri, 22 Nov 2013 18:35:34 +0000 (10:35 -0800)]