OSDN Git Service

android-x86/packages-apps-Gallery2.git
10 years agoam 40719a33: (-s ours) am 7b6ac45d: (-s ours) am 7cbf5af8: (-s ours) am e1f9ccbe...
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

10 years agoam b54384cb: (-s ours) am c862dd19: (-s ours) am eba4fb66: (-s ours) am e0659df8...
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

10 years agoam 7b6ac45d: (-s ours) am 7cbf5af8: (-s ours) am e1f9ccbe: (-s ours) Merge "Import...
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

10 years agoam c862dd19: (-s ours) am eba4fb66: (-s ours) am e0659df8: (-s ours) Import translati...
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

10 years agoam 7cbf5af8: (-s ours) am e1f9ccbe: (-s ours) Merge "Import translations. DO NOT...
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

10 years agoam eba4fb66: (-s ours) am e0659df8: (-s ours) 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

10 years agoam e1f9ccbe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
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

10 years agoam e0659df8: (-s ours) 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

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 7 Jan 2014 05:08:46 +0000 (05:08 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
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

10 years agoImport translations. DO NOT MERGE
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

10 years agoam de17ad28: (-s ours) am f1d3a0fc: (-s ours) am 6f99876d: (-s ours) am 76310806...
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

10 years agoam f1d3a0fc: (-s ours) am 6f99876d: (-s ours) am 76310806: (-s ours) Import translati...
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

10 years agoam 6f99876d: (-s ours) am 76310806: (-s ours) 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

10 years agoam 76310806: (-s ours) 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

10 years agoImport 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

10 years agoam 0abf7816: (-s ours) am 478e3183: (-s ours) am 63f898ac: (-s ours) am 299926e6...
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

10 years agoam 30728aca: (-s ours) am 6b51959c: (-s ours) am f0ab16cf: (-s ours) am b24fcaae...
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

10 years agoam 478e3183: (-s ours) am 63f898ac: (-s ours) am 299926e6: (-s ours) Merge "Import...
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

10 years agoam 6b51959c: (-s ours) am f0ab16cf: (-s ours) am b24fcaae: (-s ours) Import translati...
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

10 years agoam 63f898ac: (-s ours) am 299926e6: (-s ours) Merge "Import translations. DO NOT...
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

10 years agoam f0ab16cf: (-s ours) am b24fcaae: (-s ours) 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

10 years agoam 299926e6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
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

10 years agoam b24fcaae: (-s ours) 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

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 12 Dec 2013 15:48:25 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
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

10 years agoImport translations. DO NOT MERGE
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

10 years agoDO NOT MERGE reset to goog/klp-volantis-dev
Qiwen Zhao [Mon, 9 Dec 2013 22:20:45 +0000 (14:20 -0800)]
DO NOT MERGE reset to goog/klp-volantis-dev

10 years agoam 044648be: am 062bd465: Merge "jni: fix C99 inline linking"
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

10 years agoam 062bd465: Merge "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

10 years agoMerge "jni: fix C99 inline linking"
Nick Kralevich [Fri, 6 Dec 2013 18:45:24 +0000 (18:45 +0000)]
Merge "jni: fix C99 inline linking"

10 years agojni: 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

10 years agoam bb23e198: Merge commit \'38ef95e0802868a39ab33bcb279e20a21ec41fd8\' into HEAD
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':

10 years agoam 9b57886d: am c3606508: am 0bdafb19: Merge "add circle brush" into gb-ub-photos...
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':

10 years agoam d1b3e27b: (-s ours) am 4c89ec75: am 1b02bf12: (-s ours) DO NOT MERGE Fix build...
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':

10 years agoam 3984ba77: am 366c2ed3: Remove the unused libcutils.
Ying Wang [Thu, 5 Dec 2013 21:29:46 +0000 (21:29 +0000)]
am 3984ba77: am 366c2ed3: Remove the unused libcutils.

* commit '3984ba7795f511b88bb990f1adb552ea5f4097ce':

10 years agoam d3de4b79: am c20802f0: Remove all the tests from Gallery2 until we have them sorte...
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':

10 years agoam 8073625e: Merge remote-tracking branch \'origin/klp-dev-plus-aosp\' into klp-dev...
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':

10 years agoMerge commit '38ef95e0802868a39ab33bcb279e20a21ec41fd8' into HEAD
The Android Open Source Project [Thu, 5 Dec 2013 20:38:22 +0000 (12:38 -0800)]
Merge commit '38ef95e0802868a39ab33bcb279e20a21ec41fd8' into HEAD

10 years agoam b269d503: Merge commit \'289306f103b181378d5d58850cf61495facc3204\' into HEAD
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':

10 years agoMerge commit '289306f103b181378d5d58850cf61495facc3204' into HEAD
The Android Open Source Project [Fri, 22 Nov 2013 18:35:34 +0000 (10:35 -0800)]
Merge commit '289306f103b181378d5d58850cf61495facc3204' into HEAD

10 years agoam 07de1cf6: (-s ours) am ded9ab3b: (-s ours) am 76ad19f1: (-s ours) Merge "Import...
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

10 years agoam 4c8189fc: (-s ours) am 2a6118a6: (-s ours) am daac361f: (-s ours) Import translati...
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

10 years agoam ded9ab3b: (-s ours) am 76ad19f1: (-s ours) Merge "Import translations. DO NOT...
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

10 years agoam 2a6118a6: (-s ours) am daac361f: (-s ours) 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

10 years agoam 76ad19f1: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
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

10 years agoam daac361f: (-s ours) 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

10 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Fri, 22 Nov 2013 01:20:43 +0000 (01:20 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

10 years agoImport translations. DO NOT MERGE
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

10 years agoImport translations. DO NOT MERGE
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

10 years agoam 91628475: am 947478b6: am aa22947b: Fix the thumbnail generation.
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.

10 years agoam 947478b6: am aa22947b: 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.

10 years agoam aa22947b: 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.

10 years agoFix the thumbnail generation.
ztenghui [Tue, 19 Nov 2013 00:13:55 +0000 (16:13 -0800)]
Fix the thumbnail generation.

bug:11664501
Change-Id: I53ec5a08e801d0300b8ed159158bc46f61c6d3f4

10 years agoam 79dcd8f4: (-s ours) am 3715fb1f: (-s ours) Merge "Import translations. DO NOT...
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

10 years agoam e98e7dbc: (-s ours) am 78db2b06: (-s ours) 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

10 years agoam 3715fb1f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
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

10 years agoam 78db2b06: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Nov 2013 04:54:57 +0000 (20:54 -0800)]
am 78db2b06: (-s ours) Import translations. DO NOT MERGE

* commit '78db2b0639370f13f8d5c2590bf2b82ad843b338':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 14 Nov 2013 04:53:41 +0000 (04:53 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Nov 2013 03:01:52 +0000 (19:01 -0800)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Nov 2013 02:56:04 +0000 (18:56 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam 63e87c68: (-s ours) am 8689b2f5: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Tue, 5 Nov 2013 23:49:44 +0000 (15:49 -0800)]
am 63e87c68: (-s ours) am 8689b2f5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '63e87c686c8007389ce584f525e15573b6d1aad3':
  Import translations. DO NOT MERGE

10 years agoam be12478d: (-s ours) am a4d7d822: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 5 Nov 2013 23:49:44 +0000 (15:49 -0800)]
am be12478d: (-s ours) am a4d7d822: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 8689b2f5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 5 Nov 2013 23:19:16 +0000 (15:19 -0800)]
am 8689b2f5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '8689b2f5354146136a9d8634eb5d92834e2f5107':
  Import translations. DO NOT MERGE

10 years agoam a4d7d822: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 5 Nov 2013 23:19:15 +0000 (15:19 -0800)]
am a4d7d822: (-s ours) Import translations. DO NOT MERGE

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

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 5 Nov 2013 23:16:40 +0000 (23:16 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 350f7e3d: am 00dfa8a1: am 1619b3c3: Fix infinite spinner dialog
nicolasroard [Tue, 5 Nov 2013 05:53:53 +0000 (21:53 -0800)]
am 350f7e3d: am 00dfa8a1: am 1619b3c3: Fix infinite spinner dialog

* commit '350f7e3de777fdb331494ea5efb08809e46f980b':
  Fix infinite spinner dialog

10 years agoam c23e8d86: am 07986225: am c82e65b4: Merge "Disable geometry button if tiny planet...
nicolasroard [Tue, 5 Nov 2013 05:53:45 +0000 (21:53 -0800)]
am c23e8d86: am 07986225: am c82e65b4: Merge "Disable geometry button if tiny planet is here" into gb-ub-photos-carlsbad

* commit 'c23e8d862de72682f444f68fff3b1f30efcc21cd':
  Disable geometry button if tiny planet is here

10 years agoam d5dbfe7b: am d6644d60: am c0c6f058: Merge "fix Gallery crash using crop" into...
John Hoford [Tue, 5 Nov 2013 05:53:39 +0000 (21:53 -0800)]
am d5dbfe7b: am d6644d60: am c0c6f058: Merge "fix Gallery crash using crop" into gb-ub-photos-carlsbad

* commit 'd5dbfe7b0336ef2349dd2ca321ae4cc51cb8b1ff':
  fix Gallery crash using crop

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 5 Nov 2013 00:18:33 +0000 (16:18 -0800)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 5 Nov 2013 00:13:14 +0000 (16:13 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam 00dfa8a1: am 1619b3c3: Fix infinite spinner dialog
nicolasroard [Sat, 2 Nov 2013 18:08:50 +0000 (11:08 -0700)]
am 00dfa8a1: am 1619b3c3: Fix infinite spinner dialog

* commit '00dfa8a133995d229c8bfc17ca8b229c55d15188':
  Fix infinite spinner dialog

10 years agoam 1619b3c3: Fix infinite spinner dialog
nicolasroard [Sat, 2 Nov 2013 18:04:30 +0000 (11:04 -0700)]
am 1619b3c3: Fix infinite spinner dialog

* commit '1619b3c3ed20fad548d31464ab5a2252b2c3b65f':
  Fix infinite spinner dialog

10 years agoFix infinite spinner dialog
nicolasroard [Sat, 2 Nov 2013 03:50:30 +0000 (20:50 -0700)]
Fix infinite spinner dialog

bug:11328106

Change-Id: Icbfcb7bb6c88a03c81315789b2569da440267edd

10 years agoam 07986225: am c82e65b4: Merge "Disable geometry button if tiny planet is here"...
nicolasroard [Sat, 2 Nov 2013 01:43:02 +0000 (18:43 -0700)]
am 07986225: am c82e65b4: Merge "Disable geometry button if tiny planet is here" into gb-ub-photos-carlsbad

* commit '07986225643c5bccb472821ef68f7c285bd9fa58':
  Disable geometry button if tiny planet is here

10 years agoam c82e65b4: Merge "Disable geometry button if tiny planet is here" into gb-ub-photos...
nicolasroard [Sat, 2 Nov 2013 01:40:43 +0000 (18:40 -0700)]
am c82e65b4: Merge "Disable geometry button if tiny planet is here" into gb-ub-photos-carlsbad

* commit 'c82e65b4f05ae7ad1e910e84ebf8ba65e6afb3bd':
  Disable geometry button if tiny planet is here

10 years agoMerge "Disable geometry button if tiny planet is here" into gb-ub-photos-carlsbad
nicolasroard [Sat, 2 Nov 2013 01:37:30 +0000 (01:37 +0000)]
Merge "Disable geometry button if tiny planet is here" into gb-ub-photos-carlsbad

10 years agoam d6644d60: am c0c6f058: Merge "fix Gallery crash using crop" into gb-ub-photos...
John Hoford [Sat, 2 Nov 2013 00:32:32 +0000 (17:32 -0700)]
am d6644d60: am c0c6f058: Merge "fix Gallery crash using crop" into gb-ub-photos-carlsbad

* commit 'd6644d6047b4257c5d01848a45428651f0ae5401':
  fix Gallery crash using crop

10 years agoam c0c6f058: Merge "fix Gallery crash using crop" into gb-ub-photos-carlsbad
John Hoford [Sat, 2 Nov 2013 00:28:10 +0000 (17:28 -0700)]
am c0c6f058: Merge "fix Gallery crash using crop" into gb-ub-photos-carlsbad

* commit 'c0c6f058d464be3e4d6925239bcabc5b56fbce80':
  fix Gallery crash using crop

10 years agoMerge "fix Gallery crash using crop" into gb-ub-photos-carlsbad
John Hoford [Sat, 2 Nov 2013 00:08:20 +0000 (00:08 +0000)]
Merge "fix Gallery crash using crop" into gb-ub-photos-carlsbad

10 years agoDisable geometry button if tiny planet is here
nicolasroard [Fri, 1 Nov 2013 23:03:35 +0000 (16:03 -0700)]
Disable geometry button if tiny planet is here

bug:11288853
Change-Id: I818f406eb25e0f82c89ffde0bd91d2aa8ab31b94

10 years agofix Gallery crash using crop
John Hoford [Thu, 31 Oct 2013 23:17:01 +0000 (16:17 -0700)]
fix Gallery crash using crop

bug:11347083
Change-Id: Ic5417d12e0b1cee181ddad8d581eddc6aeb8a5b8

10 years agoam c4354f79: am 164de4d8: am 21b61954: Gallery should show up in recents even when...
Alan Newberger [Thu, 31 Oct 2013 22:44:41 +0000 (15:44 -0700)]
am c4354f79: am 164de4d8: am 21b61954: Gallery should show up in recents even when run via shortcut

* commit 'c4354f79a4c0454f26d9c471fb1b5a7bbc0a975f':
  Gallery should show up in recents even when run via shortcut

10 years agoam 164de4d8: am 21b61954: Gallery should show up in recents even when run via shortcut
Alan Newberger [Thu, 31 Oct 2013 22:41:08 +0000 (15:41 -0700)]
am 164de4d8: am 21b61954: Gallery should show up in recents even when run via shortcut

* commit '164de4d861636730b59ac3e7d64fdd2af36ac089':
  Gallery should show up in recents even when run via shortcut

10 years agoam 21b61954: Gallery should show up in recents even when run via shortcut
Alan Newberger [Thu, 31 Oct 2013 22:39:03 +0000 (15:39 -0700)]
am 21b61954: Gallery should show up in recents even when run via shortcut

* commit '21b619541d6a92d595bbe6e95d4a0b46b6f40f77':
  Gallery should show up in recents even when run via shortcut

10 years agoGallery should show up in recents even when run via shortcut
Alan Newberger [Thu, 31 Oct 2013 22:15:45 +0000 (15:15 -0700)]
Gallery should show up in recents even when run via shortcut

Gallery when run through the shortcut doesn't show up in recents. This
is a minimal change to show the activity in recents even when started
via shortcut.

Bug: 11195140
Change-Id: Iaa7230fd1874871744403b1b2e2e9216c4cb73d2

10 years agoam 2c237f11: Merge "Fix invalid private access."
Narayan Kamath [Thu, 31 Oct 2013 16:24:45 +0000 (09:24 -0700)]
am 2c237f11: Merge "Fix invalid private access."

* commit '2c237f1146ebc4385a9a0a0c6f9365aa09db5b24':
  Fix invalid private access.

10 years agoMerge "Fix invalid private access."
Narayan Kamath [Thu, 31 Oct 2013 16:18:30 +0000 (16:18 +0000)]
Merge "Fix invalid private access."

10 years agoFix invalid private access.
Narayan Kamath [Wed, 23 Oct 2013 13:39:27 +0000 (14:39 +0100)]
Fix invalid private access.

See http://bugs.sun.com/view_bug.do?bug_id=6904536

bug: 8992787

(cherry picked from ff19ed981400cd150f8779107cba1e02033b9ebe)

Change-Id: I7cad5e9cf8761b440cf91b96e3599d19bc3188d9

10 years agoam 71bf4978: am 48372e31: am ebbcc394: Avoid crash if user disables Camera while...
Alan Newberger [Wed, 30 Oct 2013 18:56:20 +0000 (11:56 -0700)]
am 71bf4978: am 48372e31: am ebbcc394: Avoid crash if user disables Camera while Gallery is open

* commit '71bf4978ef1fd5380b14126f462b7042378b31dd':
  Avoid crash if user disables Camera while Gallery is open

10 years agoam 48372e31: am ebbcc394: Avoid crash if user disables Camera while Gallery is open
Alan Newberger [Wed, 30 Oct 2013 18:53:31 +0000 (11:53 -0700)]
am 48372e31: am ebbcc394: Avoid crash if user disables Camera while Gallery is open

* commit '48372e319a4e27b08c4449391b8bc92a4a59ebbe':
  Avoid crash if user disables Camera while Gallery is open

10 years agoam ebbcc394: Avoid crash if user disables Camera while Gallery is open
Alan Newberger [Wed, 30 Oct 2013 18:50:36 +0000 (11:50 -0700)]
am ebbcc394: Avoid crash if user disables Camera while Gallery is open

* commit 'ebbcc3944adcc01846128d1bdacc7c8b1c8cdb35':
  Avoid crash if user disables Camera while Gallery is open

10 years agoAvoid crash if user disables Camera while Gallery is open
Alan Newberger [Wed, 30 Oct 2013 18:42:14 +0000 (11:42 -0700)]
Avoid crash if user disables Camera while Gallery is open

We cache the camera availability check so in the corner case that
a user disables their camera in package manager, avoid crashing.
Not necessary to do more sophisticated handling since this is a
narrow case initiated by user.

Bug: 11435559
Change-Id: I54d5015cdd9b64aec5c9da9a393824d3b41201a1

10 years agoam a0e3a6ae: (-s ours) am dcd1b260: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 29 Oct 2013 03:51:42 +0000 (20:51 -0700)]
am a0e3a6ae: (-s ours) am dcd1b260: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 9744244d: am 4edb3438: am ec036c64: Add white overscroll assets to Gallery2 for v19
Alan Newberger [Tue, 29 Oct 2013 03:51:42 +0000 (20:51 -0700)]
am 9744244d: am 4edb3438: am ec036c64: Add white overscroll assets to Gallery2 for v19

* commit '9744244d35f031917e96a314a456720c2ade2668':
  Add white overscroll assets to Gallery2 for v19

10 years agoam dcd1b260: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 29 Oct 2013 03:48:17 +0000 (20:48 -0700)]
am dcd1b260: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 4edb3438: am ec036c64: Add white overscroll assets to Gallery2 for v19
Alan Newberger [Tue, 29 Oct 2013 03:48:17 +0000 (20:48 -0700)]
am 4edb3438: am ec036c64: Add white overscroll assets to Gallery2 for v19

* commit '4edb3438a7f1120c7a6754a07029f80d6b6622bc':
  Add white overscroll assets to Gallery2 for v19

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 28 Oct 2013 23:11:52 +0000 (16:11 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam ec036c64: Add white overscroll assets to Gallery2 for v19
Alan Newberger [Fri, 25 Oct 2013 17:55:19 +0000 (10:55 -0700)]
am ec036c64: Add white overscroll assets to Gallery2 for v19

* commit 'ec036c64173ac581f460b25330248fda2a6cb57a':
  Add white overscroll assets to Gallery2 for v19

10 years agoAdd white overscroll assets to Gallery2 for v19
Alan Newberger [Fri, 25 Oct 2013 17:49:05 +0000 (10:49 -0700)]
Add white overscroll assets to Gallery2 for v19

This CL makes Gallery show white overscroll in filmstrip view,
when on v19 API devices.

Bug: 11321533
Change-Id: Ic2b2bd3567d0f08be6b2a70f7af218ac0f58c2a5