121554 Commits

Author SHA1 Message Date
Brian Carlstrom
0c2a8c7f27 am 67fa194e: am ee767548: am d9386812: am f64a30f8: am a11371f4: Merge "Track Looper decoupling from ALooper"
* commit '67fa194ecb9e1d28ae3c60110bef671a3312b13b':
  Track Looper decoupling from ALooper
2013-12-19 07:58:25 +00:00
Brian Carlstrom
67fa194ecb am ee767548: am d9386812: am f64a30f8: am a11371f4: Merge "Track Looper decoupling from ALooper"
* commit 'ee767548ba2b4d70e7c7bdc6c56dc0c6634e85d3':
  Track Looper decoupling from ALooper
2013-12-19 07:27:24 +00:00
Brian Carlstrom
ee767548ba am d9386812: am f64a30f8: am a11371f4: Merge "Track Looper decoupling from ALooper"
* commit 'd9386812169dd84a7f2bdd3a38a57b9c860525db':
  Track Looper decoupling from ALooper
2013-12-19 07:25:23 +00:00
Brian Carlstrom
d938681216 am f64a30f8: am a11371f4: Merge "Track Looper decoupling from ALooper"
* commit 'f64a30f8a68fbd6ee4f7ae2f66267e23f04c5839':
  Track Looper decoupling from ALooper
2013-12-18 23:21:50 -08:00
Brian Carlstrom
f64a30f8a6 am a11371f4: Merge "Track Looper decoupling from ALooper"
* commit 'a11371f42b4dd793a48faa3323be34bca0f6d2e6':
  Track Looper decoupling from ALooper
2013-12-18 23:16:17 -08:00
Brian Carlstrom
a11371f42b Merge "Track Looper decoupling from ALooper" 2013-12-19 07:13:02 +00:00
Baligh Uddin
0c0c0e4a26 am 48b5f4b1: (-s ours) am 73a2208d: (-s ours) am b158819d: (-s ours) am 2e371ee1: (-s ours) am c5b19fd3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '48b5f4b17677c60f6a2ff75bcc50a56182371b07':
  Import translations. DO NOT MERGE
2013-12-19 05:57:30 +00:00
Baligh Uddin
48b5f4b176 am 73a2208d: (-s ours) am b158819d: (-s ours) am 2e371ee1: (-s ours) am c5b19fd3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '73a2208de1f8e319686a8ae77733b88a261881b5':
  Import translations. DO NOT MERGE
2013-12-19 05:53:19 +00:00
Baligh Uddin
73a2208de1 am b158819d: (-s ours) am 2e371ee1: (-s ours) am c5b19fd3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'b158819d4b86e920413b5cc57e168357a0fb4203':
  Import translations. DO NOT MERGE
2013-12-19 05:48:41 +00:00
Baligh Uddin
b158819d4b am 2e371ee1: (-s ours) am c5b19fd3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '2e371ee14a59ecedeaa02d1b5f7fc518f9203520':
  Import translations. DO NOT MERGE
2013-12-18 20:55:49 -08:00
Baligh Uddin
2e371ee14a am c5b19fd3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c5b19fd397f0c42fa64d79a50edec4e20394241f':
  Import translations. DO NOT MERGE
2013-12-18 20:52:34 -08:00
Baligh Uddin
c5b19fd397 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-12-19 04:49:33 +00:00
Michael Wright
88d7a06508 Add Rhodi kl file
Change-Id: I950fd2df88b6100dce29e97fd1d9b292ed51fffe
2013-12-18 18:20:43 -08:00
Tim Murray
dc9197eecd am ebef15bd: am bf8859d8: am 9619cddb: am acf7b5d2: am 9dabdaec: Merge "Handle user-defined cache path for RS."
* commit 'ebef15bde6f4d7495c8472e2b91af29a6756f175':
  Handle user-defined cache path for RS.
2013-12-19 01:58:58 +00:00
Brian Carlstrom
82b007d757 Track Looper decoupling from ALooper
Change-Id: I54f4d36f105e60eaaa453ae60f591d634c681fd7
2013-12-18 17:56:35 -08:00
Tim Murray
ebef15bde6 am bf8859d8: am 9619cddb: am acf7b5d2: am 9dabdaec: Merge "Handle user-defined cache path for RS."
* commit 'bf8859d8b023eaf5d1f3fa186ce9cb85e15e1e81':
  Handle user-defined cache path for RS.
2013-12-19 01:55:42 +00:00
Tim Murray
bf8859d8b0 am 9619cddb: am acf7b5d2: am 9dabdaec: Merge "Handle user-defined cache path for RS."
* commit '9619cddb014f090ec4d84eb817157c7bfad94c05':
  Handle user-defined cache path for RS.
2013-12-19 01:53:32 +00:00
Tim Murray
9619cddb01 am acf7b5d2: am 9dabdaec: Merge "Handle user-defined cache path for RS."
* commit 'acf7b5d24a98dc97b551e205bf7638f47d9304c0':
  Handle user-defined cache path for RS.
2013-12-18 17:48:22 -08:00
Tim Murray
acf7b5d24a am 9dabdaec: Merge "Handle user-defined cache path for RS."
* commit '9dabdaec39836fc800bbdd5ea7b85c3d06889307':
  Handle user-defined cache path for RS.
2013-12-18 17:45:37 -08:00
Tim Murray
9dabdaec39 Merge "Handle user-defined cache path for RS." 2013-12-19 01:42:41 +00:00
Svetoslav
48df8b8528 Merge "Removed print services not fully cleaned up." 2013-12-19 01:36:36 +00:00
Svetoslav
dbcc95d4d8 Removed print services not fully cleaned up.
1. When a print services is removed it is removed from the
   installed and enabled services but not from the active
   ones while it should.

2. If a package has more than one print service (very rare
   but possible) we are executing the "make everything right"
   code for each of them which is not very optimal.

Change-Id: I7f6fc4eef10b6757d3b2ede33eb298c3399c3ff7
2013-12-18 17:35:43 -08:00
Tim Murray
804ff38bff Handle user-defined cache path for RS.
Change-Id: I92e3346dca331ae6a9dfbe4f95292bc604dfd196
2013-12-18 17:04:04 -08:00
Craig Mautner
a909969386 am 525680d2: Merge "Fix loop limits." into klp-modular-dev
* commit '525680d2bff686ecbddeb84f7f493f8bb31e670d':
  Fix loop limits.
2013-12-19 00:47:34 +00:00
Stephen Hines
2b3f9aa748 am 16c75d3a: am a341c97b: am 9fea4caf: am ad5ee2f4: (-s ours) am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer."
* commit '16c75d3a5896006bddcf4b3a39167efc1972540e':
  DO NOT MERGE - Fix improper declaration/use of pointer.
2013-12-19 00:47:30 +00:00
Craig Mautner
525680d2bf Merge "Fix loop limits." into klp-modular-dev 2013-12-19 00:45:32 +00:00
Stephen Hines
16c75d3a58 am a341c97b: am 9fea4caf: am ad5ee2f4: (-s ours) am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer."
* commit 'a341c97bf7546243fa312d98de59394442142d38':
  DO NOT MERGE - Fix improper declaration/use of pointer.
2013-12-19 00:44:27 +00:00
Craig Mautner
704e40b8ba Fix loop limits.
Fixes bug 12207606.

Change-Id: I9b450d2bc2a72a1f6581147f8930188f34c85299
2013-12-18 16:43:51 -08:00
Stephen Hines
a341c97bf7 am 9fea4caf: am ad5ee2f4: (-s ours) am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer."
* commit '9fea4caf5bb3f26c3606069218a0ecb860b86e49':
  DO NOT MERGE - Fix improper declaration/use of pointer.
2013-12-19 00:40:35 +00:00
David Christie
2df85bbb11 Merge "Clear cached locations when location providers disabled Bug: 12118307" 2013-12-19 00:39:35 +00:00
Stephen Hines
9fea4caf5b am ad5ee2f4: (-s ours) am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer."
* commit 'ad5ee2f40a1b248aea49657e9f7155daac4cf65e':
  DO NOT MERGE - Fix improper declaration/use of pointer.
2013-12-18 16:36:39 -08:00
Baligh Uddin
986859998c Import translations. DO NOT MERGE
Change-Id: I3fa88a4097e6971c92bda10756ffd3699276bac3
Auto-generated-cl: translation import
2013-12-18 16:36:21 -08:00
Stephen Hines
8e29181419 Merge "Fix improper declaration/use of pointer." 2013-12-19 00:36:01 +00:00
Stephen Hines
a0eabfbc41 Fix improper declaration/use of pointer.
https://code.google.com/p/android/issues/detail?id=61547

This variable is shadowing the outer "ptr" declaration, resulting in a
potential NULL pointer being passed to the message API.

Change-Id: If96bfae8d5e874e12597182678a180ba137b78da
2013-12-18 16:33:49 -08:00
Stephen Hines
ad5ee2f40a am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer."
* commit '7f8c70a1a48df91ee5541b03dc380c08ab6ebf42':
  DO NOT MERGE - Fix improper declaration/use of pointer.
2013-12-18 16:32:59 -08:00
Baligh Uddin
9d5a18c532 am ac143244: (-s ours) am f5570908: (-s ours) am 53ca3018: (-s ours) am 17b489f3: (-s ours) am 50391871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'ac1432443d11deb3dd5aa3ee2697312becfe75ae':
  Import translations. DO NOT MERGE
2013-12-19 00:31:45 +00:00
Baligh Uddin
f3df0f2757 am bac5ab53: (-s ours) am cdbf1e0c: (-s ours) am 200bd4d8: (-s ours) am 142be9ce: (-s ours) am db41eaef: (-s ours) Import translations. DO NOT MERGE
* commit 'bac5ab53c40ddb222c16bcb8e3ac422ae8e8e2fd':
  Import translations. DO NOT MERGE
2013-12-19 00:31:40 +00:00
Stephen Hines
7f8c70a1a4 Merge "DO NOT MERGE - Fix improper declaration/use of pointer." 2013-12-19 00:30:26 +00:00
Baligh Uddin
ac1432443d am f5570908: (-s ours) am 53ca3018: (-s ours) am 17b489f3: (-s ours) am 50391871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'f5570908a5acc1f68128c974abcfb0117a44589d':
  Import translations. DO NOT MERGE
2013-12-19 00:28:31 +00:00
Baligh Uddin
bac5ab53c4 am cdbf1e0c: (-s ours) am 200bd4d8: (-s ours) am 142be9ce: (-s ours) am db41eaef: (-s ours) Import translations. DO NOT MERGE
* commit 'cdbf1e0c5bc133cd4f8f8d6e86c28eabc0812730':
  Import translations. DO NOT MERGE
2013-12-19 00:28:26 +00:00
Baligh Uddin
f5570908a5 am 53ca3018: (-s ours) am 17b489f3: (-s ours) am 50391871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '53ca3018beb1a7a12d12cddfbc433d50ca793cf9':
  Import translations. DO NOT MERGE
2013-12-19 00:25:00 +00:00
Baligh Uddin
cdbf1e0c5b am 200bd4d8: (-s ours) am 142be9ce: (-s ours) am db41eaef: (-s ours) Import translations. DO NOT MERGE
* commit '200bd4d814fc4dc759191968f436104586cd339b':
  Import translations. DO NOT MERGE
2013-12-19 00:24:56 +00:00
Stephen Hines
57cf560719 DO NOT MERGE - Fix improper declaration/use of pointer.
https://code.google.com/p/android/issues/detail?id=61547

This variable is shadowing the outer "ptr" declaration, resulting in a
potential NULL pointer being passed to the message API.

Change-Id: If96bfae8d5e874e12597182678a180ba137b78da
2013-12-18 16:24:21 -08:00
Baligh Uddin
53ca3018be am 17b489f3: (-s ours) am 50391871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '17b489f374fc878e2118a095511e209dd69ce3d4':
  Import translations. DO NOT MERGE
2013-12-18 16:20:16 -08:00
Baligh Uddin
200bd4d814 am 142be9ce: (-s ours) am db41eaef: (-s ours) Import translations. DO NOT MERGE
* commit '142be9ce6beaca5e0949176a0a8775ba4cd9dc99':
  Import translations. DO NOT MERGE
2013-12-18 16:20:12 -08:00
Baligh Uddin
17b489f374 am 50391871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '50391871e61e491cf766fc83e261a8345d1cb5b6':
  Import translations. DO NOT MERGE
2013-12-18 16:16:30 -08:00
Baligh Uddin
142be9ce6b am db41eaef: (-s ours) Import translations. DO NOT MERGE
* commit 'db41eaef9036d069edd46d101cfa927e3a4cb694':
  Import translations. DO NOT MERGE
2013-12-18 16:16:25 -08:00
Baligh Uddin
0b96c6ce3f Merge "Import translations. DO NOT MERGE" 2013-12-19 00:14:29 +00:00
Baligh Uddin
50391871e6 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-12-19 00:14:26 +00:00
Baligh Uddin
3c5fe29ed2 Import translations. DO NOT MERGE
Change-Id: I8ece286ac0320cfbc03a0149fdb44675d425c062
Auto-generated-cl: translation import
2013-12-18 16:01:23 -08:00