OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 5f83ff6f: am e7d7908c: am 02baba25: am 67032754: Merge "AArch64: Use long for...
Narayan Kamath [Tue, 7 Jan 2014 13:06:52 +0000 (13:06 +0000)]
am 5f83ff6f: am e7d7908c: am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"

* commit '5f83ff6ffa82fb84df6feab4339054b302ac391e':
  AArch64: Use long for pointers in DisplayEventReceiver

10 years agoam 58cb0f0c: am bfbe585e: am c0c92f20: am 357ea905: Merge "AArch64: Use long for...
Narayan Kamath [Tue, 7 Jan 2014 13:06:47 +0000 (13:06 +0000)]
am 58cb0f0c: am bfbe585e: am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes"

* commit '58cb0f0c412e5405f866ef0561e593b8c99bfada':
  AArch64: Use long for pointers in audio effect classes

10 years agoam 40b0aaa9: am 568cde55: am 80cff944: am 74675f29: Merge "AArch64: Use long for...
Narayan Kamath [Tue, 7 Jan 2014 13:06:42 +0000 (13:06 +0000)]
am 40b0aaa9: am 568cde55: am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"

* commit '40b0aaa9201095f408551510ddd353dcf8c8ae26':
  AArch64: Use long for pointers in AmrInputStream

10 years agoam e7d7908c: am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in Displ...
Narayan Kamath [Tue, 7 Jan 2014 13:04:10 +0000 (13:04 +0000)]
am e7d7908c: am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"

* commit 'e7d7908c28adf77de2cefba4f2a554b770d49def':
  AArch64: Use long for pointers in DisplayEventReceiver

10 years agoam bfbe585e: am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio...
Narayan Kamath [Tue, 7 Jan 2014 13:04:06 +0000 (13:04 +0000)]
am bfbe585e: am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes"

* commit 'bfbe585ed4360b007640b227d49b6e8d7a2352b0':
  AArch64: Use long for pointers in audio effect classes

10 years agoam 568cde55: am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrIn...
Narayan Kamath [Tue, 7 Jan 2014 13:04:01 +0000 (13:04 +0000)]
am 568cde55: am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"

* commit '568cde557abfaaa5bf584cf7c3396f9efd990e6c':
  AArch64: Use long for pointers in AmrInputStream

10 years agoam 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
Narayan Kamath [Tue, 7 Jan 2014 13:01:03 +0000 (05:01 -0800)]
am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"

* commit '02baba25545b232436502a73e2928a1d72fa240e':
  AArch64: Use long for pointers in DisplayEventReceiver

10 years agoam c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes"
Narayan Kamath [Tue, 7 Jan 2014 13:00:58 +0000 (05:00 -0800)]
am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes"

* commit 'c0c92f206eddb6fb319bd11929c1703daf17248f':
  AArch64: Use long for pointers in audio effect classes

10 years agoam 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
Narayan Kamath [Tue, 7 Jan 2014 13:00:53 +0000 (05:00 -0800)]
am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"

* commit '80cff94478a39914012df816179ea57c53040903':
  AArch64: Use long for pointers in AmrInputStream

10 years agoam 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
Narayan Kamath [Tue, 7 Jan 2014 12:54:42 +0000 (04:54 -0800)]
am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"

* commit '670327544184dbd6274de9127ceaf20dfd5801b4':
  AArch64: Use long for pointers in DisplayEventReceiver

10 years agoam 357ea905: Merge "AArch64: Use long for pointers in audio effect classes"
Narayan Kamath [Tue, 7 Jan 2014 12:54:35 +0000 (04:54 -0800)]
am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes"

* commit '357ea90515025d806c6360ef846bf6f84b45a64e':
  AArch64: Use long for pointers in audio effect classes

10 years agoam 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
Narayan Kamath [Tue, 7 Jan 2014 12:50:56 +0000 (04:50 -0800)]
am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"

* commit '74675f29133ff36dccc95387392bf3654dc94e15':
  AArch64: Use long for pointers in AmrInputStream

10 years agoMerge "AArch64: Use long for pointers in DisplayEventReceiver"
Narayan Kamath [Tue, 7 Jan 2014 12:49:27 +0000 (12:49 +0000)]
Merge "AArch64: Use long for pointers in DisplayEventReceiver"

10 years agoAArch64: Use long for pointers in DisplayEventReceiver
Ashok Bhat [Wed, 18 Dec 2013 18:00:05 +0000 (18:00 +0000)]
AArch64: Use long for pointers in DisplayEventReceiver

For storing pointers, long is used as
native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I3c0855373c0e4bedc172adb82b103586de9219dc
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
10 years agoMerge "AArch64: Use long for pointers in audio effect classes"
Narayan Kamath [Tue, 7 Jan 2014 12:48:21 +0000 (12:48 +0000)]
Merge "AArch64: Use long for pointers in audio effect classes"

10 years agoAArch64: Use long for pointers in audio effect classes
Ashok Bhat [Tue, 17 Dec 2013 12:42:00 +0000 (12:42 +0000)]
AArch64: Use long for pointers in audio effect classes

For storing pointers, long is used in AudioEffect
and Visualizer classes, as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Ief49bbe5baef663e268c7f6d70ac33a4df45621c
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
10 years agoMerge "AArch64: Use long for pointers in AmrInputStream"
Narayan Kamath [Tue, 7 Jan 2014 12:45:06 +0000 (12:45 +0000)]
Merge "AArch64: Use long for pointers in AmrInputStream"

10 years agoAArch64: Use long for pointers in AmrInputStream
Ashok Bhat [Tue, 17 Dec 2013 14:10:25 +0000 (14:10 +0000)]
AArch64: Use long for pointers in AmrInputStream

For storing pointers, long is used in AmrInputStream
class, as native pointers can be 64-bit.

Change-Id: I78fff3eb54fc7101746b0d693cbc4e923c2bad08
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
10 years agoam 3f2843a4: am c47b7d37: am 9d4ebdca: am cf1aa551: Merge "XmlUtils#readThisMapXml...
Narayan Kamath [Tue, 7 Jan 2014 10:14:00 +0000 (10:14 +0000)]
am 3f2843a4: am c47b7d37: am 9d4ebdca: am cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."

* commit '3f2843a447f037492cf6d2fde928ef88a1d77bc8':
  XmlUtils#readThisMapXml should handle null keys.

10 years agoam ce9418c5: am c797fd61: am c9e27802: am 7e296254: Merge "Fix broken XML parsing...
Narayan Kamath [Tue, 7 Jan 2014 10:13:53 +0000 (10:13 +0000)]
am ce9418c5: am c797fd61: am c9e27802: am 7e296254: Merge "Fix broken XML parsing idiom."

* commit 'ce9418c59e1c9e696b35123d75c077c164893b9f':
  Fix broken XML parsing idiom.

10 years agoam c47b7d37: am 9d4ebdca: am cf1aa551: Merge "XmlUtils#readThisMapXml should handle...
Narayan Kamath [Tue, 7 Jan 2014 10:10:49 +0000 (10:10 +0000)]
am c47b7d37: am 9d4ebdca: am cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."

* commit 'c47b7d377c4785f84a22c42c6a99716cceb5973c':
  XmlUtils#readThisMapXml should handle null keys.

10 years agoam c797fd61: am c9e27802: am 7e296254: Merge "Fix broken XML parsing idiom."
Narayan Kamath [Tue, 7 Jan 2014 10:10:45 +0000 (10:10 +0000)]
am c797fd61: am c9e27802: am 7e296254: Merge "Fix broken XML parsing idiom."

* commit 'c797fd614d28a0c5c3aacbff325e9de572d7f091':
  Fix broken XML parsing idiom.

10 years agoam 9d4ebdca: am cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."
Narayan Kamath [Tue, 7 Jan 2014 10:08:02 +0000 (02:08 -0800)]
am 9d4ebdca: am cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."

* commit '9d4ebdcafaa6a3f29978a7095f2bc3cbe0d5240a':
  XmlUtils#readThisMapXml should handle null keys.

10 years agoam c9e27802: am 7e296254: Merge "Fix broken XML parsing idiom."
Narayan Kamath [Tue, 7 Jan 2014 10:07:56 +0000 (02:07 -0800)]
am c9e27802: am 7e296254: Merge "Fix broken XML parsing idiom."

* commit 'c9e27802f049b9c3086770a7710b421ce33d2791':
  Fix broken XML parsing idiom.

10 years agoam cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."
Narayan Kamath [Tue, 7 Jan 2014 10:05:39 +0000 (02:05 -0800)]
am cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."

* commit 'cf1aa551eed7be4310a386b9b9e458e46847207a':
  XmlUtils#readThisMapXml should handle null keys.

10 years agoam 7e296254: Merge "Fix broken XML parsing idiom."
Narayan Kamath [Tue, 7 Jan 2014 10:05:35 +0000 (02:05 -0800)]
am 7e296254: Merge "Fix broken XML parsing idiom."

* commit '7e29625463e6034147c24992d0ad319ddf426088':
  Fix broken XML parsing idiom.

10 years agoMerge "XmlUtils#readThisMapXml should handle null keys."
Narayan Kamath [Tue, 7 Jan 2014 10:03:20 +0000 (10:03 +0000)]
Merge "XmlUtils#readThisMapXml should handle null keys."

10 years agoMerge "Fix broken XML parsing idiom."
Narayan Kamath [Tue, 7 Jan 2014 10:02:57 +0000 (10:02 +0000)]
Merge "Fix broken XML parsing idiom."

10 years agoam 976b0d13: am fd08cd48: am 0d4068ad: am ff65ca29: Merge "docs: Updated instructions...
quddusc [Tue, 7 Jan 2014 00:41:21 +0000 (00:41 +0000)]
am 976b0d13: am fd08cd48: am 0d4068ad: am ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs

* commit '976b0d135a87217212e0294b8e4ab07a6034f179':
  docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477

10 years agoam 24c2980c: (-s ours) am be24e41b: (-s ours) am 2c4d6d91: (-s ours) am fd8be467...
Baligh Uddin [Tue, 7 Jan 2014 00:41:17 +0000 (00:41 +0000)]
am 24c2980c: (-s ours) am be24e41b: (-s ours) am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '24c2980cb2a9a93d1d6fe2a849f915b3819056c2':
  Import translations. DO NOT MERGE

10 years agoam fce88971: (-s ours) am f256f49f: (-s ours) am 258bd63f: (-s ours) am 6e15a49e...
Baligh Uddin [Tue, 7 Jan 2014 00:41:12 +0000 (00:41 +0000)]
am fce88971: (-s ours) am f256f49f: (-s ours) am 258bd63f: (-s ours) am 6e15a49e: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam fd08cd48: am 0d4068ad: am ff65ca29: Merge "docs: Updated instructions for setting...
quddusc [Tue, 7 Jan 2014 00:37:50 +0000 (00:37 +0000)]
am fd08cd48: am 0d4068ad: am ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs

* commit 'fd08cd4852e285434e9067e09cad41bef28068ca':
  docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477

10 years agoam be24e41b: (-s ours) am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import...
Baligh Uddin [Tue, 7 Jan 2014 00:37:46 +0000 (00:37 +0000)]
am be24e41b: (-s ours) am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam f256f49f: (-s ours) am 258bd63f: (-s ours) am 6e15a49e: (-s ours) Import translati...
Baligh Uddin [Tue, 7 Jan 2014 00:37:41 +0000 (00:37 +0000)]
am f256f49f: (-s ours) am 258bd63f: (-s ours) am 6e15a49e: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 0d4068ad: am ff65ca29: Merge "docs: Updated instructions for setting up In-app...
quddusc [Tue, 7 Jan 2014 00:30:35 +0000 (16:30 -0800)]
am 0d4068ad: am ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs

* commit '0d4068ad1cbc8b8c550118c2214eb70116b83f81':
  docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477

10 years agoam 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Tue, 7 Jan 2014 00:30:30 +0000 (16:30 -0800)]
am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '2c4d6d91e21ae678cff7b9ee2c78ffd0681d5da2':
  Import translations. DO NOT MERGE

10 years agoam 258bd63f: (-s ours) am 6e15a49e: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 00:30:25 +0000 (16:30 -0800)]
am 258bd63f: (-s ours) am 6e15a49e: (-s ours) Import translations. DO NOT MERGE

* commit '258bd63f38d90ac96aac5eb4e3a5c696e8b089f8':
  Import translations. DO NOT MERGE

10 years agoam 849ab14d: am 7f16047b: am 73a6702e: am 4440a824: Merge "CompoundButton: Let text...
Conley Owens [Mon, 6 Jan 2014 23:48:58 +0000 (23:48 +0000)]
am 849ab14d: am 7f16047b: am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config"

* commit '849ab14d7237d3474f6dde3731ab65624ac297ac':
  CompoundButton: Let text can be changed by config

10 years agoam 7f16047b: am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed...
Conley Owens [Mon, 6 Jan 2014 23:46:00 +0000 (23:46 +0000)]
am 7f16047b: am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config"

* commit '7f16047b9efeba7cf82690b0492eaed44ca017df':
  CompoundButton: Let text can be changed by config

10 years agoam 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config"
Conley Owens [Mon, 6 Jan 2014 23:41:50 +0000 (15:41 -0800)]
am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config"

* commit '73a6702eeaabdeb7b405ec504413d41716ef3508':
  CompoundButton: Let text can be changed by config

10 years agoam 4440a824: Merge "CompoundButton: Let text can be changed by config"
Conley Owens [Mon, 6 Jan 2014 23:38:05 +0000 (15:38 -0800)]
am 4440a824: Merge "CompoundButton: Let text can be changed by config"

* commit '4440a8244ea4fdd7c63083bcd7d4b179e851c17a':
  CompoundButton: Let text can be changed by config

10 years agoMerge "CompoundButton: Let text can be changed by config"
Conley Owens [Mon, 6 Jan 2014 23:36:02 +0000 (23:36 +0000)]
Merge "CompoundButton: Let text can be changed by config"

10 years agoam ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test...
quddusc [Mon, 6 Jan 2014 21:58:03 +0000 (21:58 +0000)]
am ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs

* commit 'ff65ca29a00aa282160dd8a77cdd6ed6855abba7':
  docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477

10 years agoMerge "docs: Updated instructions for setting up In-app Billing test accounts to...
quddusc [Mon, 6 Jan 2014 21:55:28 +0000 (21:55 +0000)]
Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs

10 years agoam fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 6 Jan 2014 21:47:50 +0000 (13:47 -0800)]
am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam 6e15a49e: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 6 Jan 2014 21:47:46 +0000 (13:47 -0800)]
am 6e15a49e: (-s ours) Import translations. DO NOT MERGE

* commit '6e15a49eee1398aaf73f6b994b4148b198b67430':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 6 Jan 2014 21:45:15 +0000 (21:45 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 6 Jan 2014 21:15:51 +0000 (13:15 -0800)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 6 Jan 2014 20:16:37 +0000 (12:16 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam ece5bc9d: am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize error after...
Raph Levien [Mon, 6 Jan 2014 17:12:18 +0000 (17:12 +0000)]
am ece5bc9d: am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize error after attach"

* commit 'ece5bc9d692ec1579f45d9e28fdf52c1d966a21b':
  Re-initialize error after attach

10 years agoam 91ecb36d: ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE
Todd Poynor [Mon, 6 Jan 2014 17:12:11 +0000 (17:12 +0000)]
am 91ecb36d: ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE

* commit '91ecb36df50be3446809e9da2a8f571d157f7549':
  ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE

10 years agoam 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize error after attach"
Raph Levien [Mon, 6 Jan 2014 17:08:56 +0000 (17:08 +0000)]
am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize error after attach"

* commit '7b6b85d260fb4fe739e0af0cc0328e0678872899':
  Re-initialize error after attach

10 years agoam d7d07498: am a980c7aa: Merge "Re-initialize error after attach"
Raph Levien [Mon, 6 Jan 2014 17:06:06 +0000 (09:06 -0800)]
am d7d07498: am a980c7aa: Merge "Re-initialize error after attach"

* commit 'd7d0749805b6ae8bb345731ac9dd960f6b5aa5dd':
  Re-initialize error after attach

10 years agoam a980c7aa: Merge "Re-initialize error after attach"
Raph Levien [Mon, 6 Jan 2014 17:04:03 +0000 (09:04 -0800)]
am a980c7aa: Merge "Re-initialize error after attach"

* commit 'a980c7aa3ec901b7c4201776a9a4e3a5fc3e50df':
  Re-initialize error after attach

10 years agoMerge "Re-initialize error after attach"
Raph Levien [Mon, 6 Jan 2014 17:00:49 +0000 (17:00 +0000)]
Merge "Re-initialize error after attach"

10 years agoFix broken XML parsing idiom.
Narayan Kamath [Mon, 6 Jan 2014 11:31:35 +0000 (11:31 +0000)]
Fix broken XML parsing idiom.

Code that expected a single top level element in an XML file
was doing something like :

while (type != START_TAG) { next(); }

This would loop forever when the XML being parsed was empty,
where each call to XmlPullParser.next() would return END_DOCUMENT.

bug: https://code.google.com/p/android/issues/detail?id=64173
Change-Id: I7543203e976a8999ae471a6c2d629249a87011bb

10 years agoXmlUtils#readThisMapXml should handle null keys.
Narayan Kamath [Wed, 18 Dec 2013 15:19:17 +0000 (15:19 +0000)]
XmlUtils#readThisMapXml should handle null keys.

Both readThisValueXml & writeThisValueXml have been
implemented to handle values with "null" names.

Change readThisMapXml to allow such names as well, and
map them to the null key in the resulting HashMap.
readThisListXml and readThisSetXml already support
null names.

bug: https://code.google.com/p/android/issues/detail?id=63463

Change-Id: I1c93976656e45e7733113eb67d29b6bad5d25f1f

10 years agoActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE
Todd Poynor [Thu, 11 Jul 2013 02:15:07 +0000 (19:15 -0700)]
ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE

Change-Id: Ie2f8af1e411c28d7f03be56c356ec39e1d71558e

10 years agoam d59c6151: am 406fb742: am 65f5d74e: am 048895b5: Merge "Doc update: update console...
Katie McCormick [Fri, 3 Jan 2014 21:21:53 +0000 (21:21 +0000)]
am d59c6151: am 406fb742: am 65f5d74e: am 048895b5: Merge "Doc update: update console instructions per new UI." into klp-docs

* commit 'd59c615177ad827fd65dcdf4f595f40f84ca6cc5':
  Doc update: update console instructions per new UI.

10 years agoam 406fb742: am 65f5d74e: am 048895b5: Merge "Doc update: update console instructions...
Katie McCormick [Fri, 3 Jan 2014 21:18:21 +0000 (21:18 +0000)]
am 406fb742: am 65f5d74e: am 048895b5: Merge "Doc update: update console instructions per new UI." into klp-docs

* commit '406fb742f461e3deda83984a47e66fc6bccacc78':
  Doc update: update console instructions per new UI.

10 years agoam 65f5d74e: am 048895b5: Merge "Doc update: update console instructions per new...
Katie McCormick [Fri, 3 Jan 2014 21:15:23 +0000 (13:15 -0800)]
am 65f5d74e: am 048895b5: Merge "Doc update: update console instructions per new UI." into klp-docs

* commit '65f5d74eada8937d68c821ff4f1c609e16613d22':
  Doc update: update console instructions per new UI.

10 years agoam 048895b5: Merge "Doc update: update console instructions per new UI." into klp...
Katie McCormick [Fri, 3 Jan 2014 21:12:42 +0000 (21:12 +0000)]
am 048895b5: Merge "Doc update: update console instructions per new UI." into klp-docs

* commit '048895b5a0532fef394a4a3f07af737f8d733335':
  Doc update: update console instructions per new UI.

10 years agoMerge "Doc update: update console instructions per new UI." into klp-docs
Katie McCormick [Fri, 3 Jan 2014 21:09:37 +0000 (21:09 +0000)]
Merge "Doc update: update console instructions per new UI." into klp-docs

10 years agodocs: Updated instructions for setting up In-app Billing test accounts to reflect...
quddusc [Thu, 2 Jan 2014 19:39:02 +0000 (11:39 -0800)]
docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI.
Bug: 7044477

Change-Id: I722dc2e47c8dbe0cba48e44434d62fe28f23714f

10 years agoam cc265eaf: (-s ours) am bb23697a: (-s ours) am d58d91ef: (-s ours) am 2ae0419f...
Baligh Uddin [Mon, 30 Dec 2013 18:55:43 +0000 (18:55 +0000)]
am cc265eaf: (-s ours) am bb23697a: (-s ours) am d58d91ef: (-s ours) am 2ae0419f: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam bb23697a: (-s ours) am d58d91ef: (-s ours) am 2ae0419f: (-s ours) Import translati...
Baligh Uddin [Mon, 30 Dec 2013 18:52:29 +0000 (18:52 +0000)]
am bb23697a: (-s ours) am d58d91ef: (-s ours) am 2ae0419f: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam d58d91ef: (-s ours) am 2ae0419f: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 18:49:56 +0000 (10:49 -0800)]
am d58d91ef: (-s ours) am 2ae0419f: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 2ae0419f: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 18:47:12 +0000 (10:47 -0800)]
am 2ae0419f: (-s ours) Import translations. DO NOT MERGE

* commit '2ae0419fb1ecd7e0705b7b87f8e73d6b73869bca':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 17:30:42 +0000 (09:30 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam 5cf8dc8e: (-s ours) am ca7a1442: (-s ours) am a95f6e3a: (-s ours) am bbeb3135...
Baligh Uddin [Thu, 26 Dec 2013 23:50:28 +0000 (23:50 +0000)]
am 5cf8dc8e: (-s ours) am ca7a1442: (-s ours) am a95f6e3a: (-s ours) am bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '5cf8dc8ea5b364802f9e986ddb7f4e21652145be':
  Import translations. DO NOT MERGE

10 years agoam 28e21fb4: (-s ours) am 4c60be5b: (-s ours) am 7aa56efd: (-s ours) am 7bb3e3b9...
Baligh Uddin [Thu, 26 Dec 2013 23:50:23 +0000 (23:50 +0000)]
am 28e21fb4: (-s ours) am 4c60be5b: (-s ours) am 7aa56efd: (-s ours) am 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '28e21fb425aad90d4c76dcc618caf1cb5f0cf7ed':
  Import translations. DO NOT MERGE

10 years agoam c3e5b034: (-s ours) am ad141bd7: (-s ours) am dd6517c9: (-s ours) am ea227306...
Baligh Uddin [Thu, 26 Dec 2013 23:50:18 +0000 (23:50 +0000)]
am c3e5b034: (-s ours) am ad141bd7: (-s ours) am dd6517c9: (-s ours) am ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam 6afb554c: (-s ours) am b6d55917: (-s ours) am e965be75: (-s ours) am d6e863a1...
Baligh Uddin [Thu, 26 Dec 2013 23:50:13 +0000 (23:50 +0000)]
am 6afb554c: (-s ours) am b6d55917: (-s ours) am e965be75: (-s ours) am d6e863a1: (-s ours) Import translations. DO NOT MERGE

* commit '6afb554cf07d2a4a2bffed34b696690d8ed0450a':
  Import translations. DO NOT MERGE

10 years agoam ac4ebda9: am f16ddd6d: am 2a191297: am cbc5f541: Merge "docs: Added a statement...
quddusc [Thu, 26 Dec 2013 23:50:08 +0000 (23:50 +0000)]
am ac4ebda9: am f16ddd6d: am 2a191297: am cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs

* commit 'ac4ebda9f64f7ff54270f9448f597bac4dea71fc':
  docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2

10 years agoam 9dd65b93: am cd73f770: am 5d98ddf2: am fca563a2: docs: Fixed code snippet for...
quddusc [Thu, 26 Dec 2013 23:50:02 +0000 (23:50 +0000)]
am 9dd65b93: am cd73f770: am 5d98ddf2: am fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905

* commit '9dd65b9397c97726bdd55ee7e91905f9ee34597c':
  docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905

10 years agoam 4e5a9b72: am 317109df: am e94bca2d: am 70b96ec7: Merge "docs: Added missing elemen...
quddusc [Thu, 26 Dec 2013 23:49:57 +0000 (23:49 +0000)]
am 4e5a9b72: am 317109df: am e94bca2d: am 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs

* commit '4e5a9b72afbd902227d8dcef6426d3a3be41daef':
  docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521

10 years agoam c609cb0d: am b889885e: am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate...
quddusc [Thu, 26 Dec 2013 23:49:51 +0000 (23:49 +0000)]
am c609cb0d: am b889885e: am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs

* commit 'c609cb0d62b25b2526b8401e576df4dce5aa5a92':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017

10 years agoam bb6316db: am 5938b9a0: am 5ad0e628: am 12182bc2: Merge "docs: Fixed deprecated...
quddusc [Thu, 26 Dec 2013 23:49:45 +0000 (23:49 +0000)]
am bb6316db: am 5938b9a0: am 5ad0e628: am 12182bc2: Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs

* commit 'bb6316db12418c3f010f8c730f6d4644920bbe8a':
  docs: Fixed deprecated constructor. Bug: 10581815

10 years agoam c2a3227a: am 39b79982: am 52604aad: am 240aca33: docs: Changed the title of the...
quddusc [Thu, 26 Dec 2013 23:49:39 +0000 (23:49 +0000)]
am c2a3227a: am 39b79982: am 52604aad: am 240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google."

* commit 'c2a3227a3d4bc055f311b50693b671c9667cfa67':
  docs: Changed the title of the class to "Making Your App Content Searchable by Google."

10 years agoam ca7a1442: (-s ours) am a95f6e3a: (-s ours) am bbeb3135: (-s ours) Merge "Import...
Baligh Uddin [Thu, 26 Dec 2013 23:44:18 +0000 (23:44 +0000)]
am ca7a1442: (-s ours) am a95f6e3a: (-s ours) am bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam 4c60be5b: (-s ours) am 7aa56efd: (-s ours) am 7bb3e3b9: (-s ours) Merge "Import...
Baligh Uddin [Thu, 26 Dec 2013 23:44:08 +0000 (23:44 +0000)]
am 4c60be5b: (-s ours) am 7aa56efd: (-s ours) am 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '4c60be5b135dd13556e947784f20f792c1f9d568':
  Import translations. DO NOT MERGE

10 years agoam ad141bd7: (-s ours) am dd6517c9: (-s ours) am ea227306: (-s ours) Merge "Import...
Baligh Uddin [Thu, 26 Dec 2013 23:44:03 +0000 (23:44 +0000)]
am ad141bd7: (-s ours) am dd6517c9: (-s ours) am ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam b6d55917: (-s ours) am e965be75: (-s ours) am d6e863a1: (-s ours) Import translati...
Baligh Uddin [Thu, 26 Dec 2013 23:43:59 +0000 (23:43 +0000)]
am b6d55917: (-s ours) am e965be75: (-s ours) am d6e863a1: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam f16ddd6d: am 2a191297: am cbc5f541: Merge "docs: Added a statement for "android...
quddusc [Thu, 26 Dec 2013 23:43:54 +0000 (23:43 +0000)]
am f16ddd6d: am 2a191297: am cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs

* commit 'f16ddd6dd4fae500b7b512568db2c55b8919d920':
  docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2

10 years agoam cd73f770: am 5d98ddf2: am fca563a2: docs: Fixed code snippet for unbinding from...
quddusc [Thu, 26 Dec 2013 23:43:49 +0000 (23:43 +0000)]
am cd73f770: am 5d98ddf2: am fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905

* commit 'cd73f7702fca082bf46d64b5c011f9dbe1b5fe65':
  docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905

10 years agoam 317109df: am e94bca2d: am 70b96ec7: Merge "docs: Added missing elements under...
quddusc [Thu, 26 Dec 2013 23:43:45 +0000 (23:43 +0000)]
am 317109df: am e94bca2d: am 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs

* commit '317109dfaf0682f6ffbf11d71f3da84dfa295df6':
  docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521

10 years agoam b889885e: am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollS...
quddusc [Thu, 26 Dec 2013 23:43:40 +0000 (23:43 +0000)]
am b889885e: am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs

* commit 'b889885e9b5a605329ff8d7a35c373c88abf8c35':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017

10 years agoam 5938b9a0: am 5ad0e628: am 12182bc2: Merge "docs: Fixed deprecated constructor...
quddusc [Thu, 26 Dec 2013 23:43:36 +0000 (23:43 +0000)]
am 5938b9a0: am 5ad0e628: am 12182bc2: Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs

* commit '5938b9a00e0133ca093755568c9a8a2e202f7daf':
  docs: Fixed deprecated constructor. Bug: 10581815

10 years agoam 39b79982: am 52604aad: am 240aca33: docs: Changed the title of the class to "Makin...
quddusc [Thu, 26 Dec 2013 23:43:31 +0000 (23:43 +0000)]
am 39b79982: am 52604aad: am 240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google."

* commit '39b799820db4fa258dadb45b030830656168f95b':
  docs: Changed the title of the class to "Making Your App Content Searchable by Google."

10 years agoam a95f6e3a: (-s ours) am bbeb3135: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 26 Dec 2013 23:34:23 +0000 (15:34 -0800)]
am a95f6e3a: (-s ours) am bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam 7aa56efd: (-s ours) am 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 26 Dec 2013 23:34:18 +0000 (15:34 -0800)]
am 7aa56efd: (-s ours) am 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '7aa56efd7399b0628bde655c535fac6407eaade9':
  Import translations. DO NOT MERGE

10 years agoam dd6517c9: (-s ours) am ea227306: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 26 Dec 2013 23:34:14 +0000 (15:34 -0800)]
am dd6517c9: (-s ours) am ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam e965be75: (-s ours) am d6e863a1: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:34:10 +0000 (15:34 -0800)]
am e965be75: (-s ours) am d6e863a1: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 2a191297: am cbc5f541: Merge "docs: Added a statement for "android:name" attribute...
quddusc [Thu, 26 Dec 2013 23:34:03 +0000 (15:34 -0800)]
am 2a191297: am cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs

* commit '2a1912971849b929dc2e4ec8d6368f477b1fddae':
  docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2

10 years agoam 5d98ddf2: am fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service...
quddusc [Thu, 26 Dec 2013 23:33:58 +0000 (15:33 -0800)]
am 5d98ddf2: am fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905

* commit '5d98ddf2f741c2a635b9df90cf896c9faceb1b33':
  docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905

10 years agoam e94bca2d: am 70b96ec7: Merge "docs: Added missing elements under "can contain...
quddusc [Thu, 26 Dec 2013 23:33:52 +0000 (15:33 -0800)]
am e94bca2d: am 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs

* commit 'e94bca2d8491e4b38fc987dbfe1f8fe0a4384c8f':
  docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521

10 years agoam 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged...
quddusc [Thu, 26 Dec 2013 23:33:47 +0000 (15:33 -0800)]
am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs

* commit '34dbf7c32327dc61a106b9a2f50e22cdb6cf6242':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017

10 years agoam 5ad0e628: am 12182bc2: Merge "docs: Fixed deprecated constructor. Bug: 10581815...
quddusc [Thu, 26 Dec 2013 23:33:43 +0000 (15:33 -0800)]
am 5ad0e628: am 12182bc2: Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs

* commit '5ad0e6289119dfaaa50a663e88dc0b978447302c':
  docs: Fixed deprecated constructor. Bug: 10581815

10 years agoam 52604aad: am 240aca33: docs: Changed the title of the class to "Making Your App...
quddusc [Thu, 26 Dec 2013 23:33:37 +0000 (15:33 -0800)]
am 52604aad: am 240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google."

* commit '52604aadaafc0921c2f81df715f01bec546021a2':
  docs: Changed the title of the class to "Making Your App Content Searchable by Google."

10 years agoam bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 26 Dec 2013 21:00:44 +0000 (13:00 -0800)]
am bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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