Kenny Root
87ec50914c
am 2d7316d7: am 2a288bab: am fc2f459c: Merge "Add GCMParameterSpec to preloaded-classes"
...
* commit '2d7316d72d3aacf70b0ad2a51b3bdc53d1c025b3':
Add GCMParameterSpec to preloaded-classes
2013-12-13 01:19:59 +00:00
Kenny Root
2d7316d72d
am 2a288bab: am fc2f459c: Merge "Add GCMParameterSpec to preloaded-classes"
...
* commit '2a288babaef57308e042ed97caea6b49c8ae5033':
Add GCMParameterSpec to preloaded-classes
2013-12-13 01:16:45 +00:00
Kenny Root
2a288babae
am fc2f459c: Merge "Add GCMParameterSpec to preloaded-classes"
...
* commit 'fc2f459c522448331b79c388e9f7b19f72650586':
Add GCMParameterSpec to preloaded-classes
2013-12-12 17:13:38 -08:00
Kenny Root
fc2f459c52
Merge "Add GCMParameterSpec to preloaded-classes"
2013-12-13 01:08:26 +00:00
Katie McCormick
9c514b8fe9
am 4561f199: am 08e0142f: am f85470e6: am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs
...
* commit '4561f1990def36aef17dbb35511a1522195e7f95':
Doc update: Update package summary for BT.
2013-12-13 01:04:09 +00:00
Katie McCormick
4561f1990d
am 08e0142f: am f85470e6: am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs
...
* commit '08e0142fb72cf08a5784b20d42d18bf7a35370cf':
Doc update: Update package summary for BT.
2013-12-13 01:01:18 +00:00
Katie McCormick
08e0142fb7
am f85470e6: am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs
...
* commit 'f85470e6861e012c145dc04d70656757be611280':
Doc update: Update package summary for BT.
2013-12-12 16:58:35 -08:00
Katie McCormick
f85470e686
am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs
...
* commit 'fbbc1b791e0a26a56bc8d45622d06f06e020191a':
Doc update: Update package summary for BT.
2013-12-13 00:55:59 +00:00
Katie McCormick
fbbc1b791e
Merge "Doc update: Update package summary for BT." into klp-docs
2013-12-13 00:52:33 +00:00
Kenny Root
e1263de835
Add GCMParameterSpec to preloaded-classes
...
Needed for Bouncycastle 1.50 upgrade with art.
Change-Id: I901122c1ce21abba437a7537e70331724c3cbc9c
2013-12-13 00:40:00 +00:00
Katie McCormick
f2041ac56e
Doc update: Update package summary for BT.
...
Fixes:
b/8584860
Change-Id: Ic85436f90b46508e6a182e3fc51365f5bfb8da14
2013-12-12 15:42:00 -08:00
Katie McCormick
9a72ebdfb6
am b1738b3a: am 7162b920: am 861f8d85: am a58967a9: Doc update: removed the word "new".
...
* commit 'b1738b3a272439c7e2c0d55875fa37f3c3acfddc':
Doc update: removed the word "new".
2013-12-12 02:32:07 +00:00
Katie McCormick
b1738b3a27
am 7162b920: am 861f8d85: am a58967a9: Doc update: removed the word "new".
...
* commit '7162b9200707d43bba7168e86073b32ca39c2cd2':
Doc update: removed the word "new".
2013-12-12 02:28:41 +00:00
Katie McCormick
7162b92007
am 861f8d85: am a58967a9: Doc update: removed the word "new".
...
* commit '861f8d8503bf1c384b3fc39531b2ea6db563ebb3':
Doc update: removed the word "new".
2013-12-11 18:25:56 -08:00
Katie McCormick
861f8d8503
am a58967a9: Doc update: removed the word "new".
...
* commit 'a58967a9899e691a28fc8e277115838e2b0d0f67':
Doc update: removed the word "new".
2013-12-12 02:23:04 +00:00
Katie McCormick
a58967a989
Doc update: removed the word "new".
...
Change-Id: I8764d94e0f924feeae21a0230dc4f50eacf7754a
2013-12-11 18:17:28 -08:00
Todd Poynor
c52afd2532
am c95bb562: Add previous console on pstore to DropBox
...
* commit 'c95bb562e8c67c258623fe70e8001a08e59b8c7d':
Add previous console on pstore to DropBox
2013-12-12 00:49:42 +00:00
Todd Poynor
c95bb562e8
Add previous console on pstore to DropBox
...
Change-Id: I23c0213fe3d52280d7338ca62cb7e79b80a16cc6
2013-12-12 00:44:30 +00:00
Dirk Dougherty
0bef299c76
am b319cde4: am 312165a8: am f93cc02f: am c6da5232: Merge "Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3." into klp-docs
...
* commit 'b319cde435b6dd77eab7dbf788567cc5f8a02bcf':
Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3.
2013-12-12 00:08:25 +00:00
Dirk Dougherty
b319cde435
am 312165a8: am f93cc02f: am c6da5232: Merge "Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3." into klp-docs
...
* commit '312165a843b6c30128493ba8dcf632d1496ade61':
Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3.
2013-12-12 00:05:30 +00:00
Dirk Dougherty
312165a843
am f93cc02f: am c6da5232: Merge "Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3." into klp-docs
...
* commit 'f93cc02f70d06060ad487fec868e565129c9282c':
Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3.
2013-12-11 16:00:13 -08:00
Dirk Dougherty
f93cc02f70
am c6da5232: Merge "Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3." into klp-docs
...
* commit 'c6da523207d3ddf7b9da98fcb5e461f286eb7aa4':
Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3.
2013-12-11 23:41:11 +00:00
Dirk Dougherty
c6da523207
Merge "Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3." into klp-docs
2013-12-11 23:38:20 +00:00
Dirk Dougherty
103c212691
Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3.
...
Change-Id: I9592f5364afd3c24ab047bb938bdaf6e8bf3b922
2013-12-11 15:35:30 -08:00
Nick Kralevich
411954aef0
am a6416309: am 1e137549: am efa5c88f: Merge "Don\'t try to set service.bootanim.exit"
...
* commit 'a64163093e6e55f8bbb0153e783fb0ab635e9e60':
Don't try to set service.bootanim.exit
2013-12-11 22:08:05 +00:00
Baligh Uddin
851138fcee
am dd914cc2: (-s ours) am 5d819bef: (-s ours) am 32aa8222: (-s ours) am 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'dd914cc253afcccd0513df90f22013d8ad01a18a':
Import translations. DO NOT MERGE
2013-12-11 22:08:00 +00:00
Baligh Uddin
a9024556c4
am ac7737fc: (-s ours) am 6a8b1691: (-s ours) am e30461c0: (-s ours) am 60835d4b: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ac7737fc99561344c19a267f7e8d1fe5e27d32a0':
Import translations. DO NOT MERGE
2013-12-11 22:07:55 +00:00
Marco Nelissen
4f6a139493
am c680bab3: am 69b46707: am ce3bd309: Merge "Parse UUID string with Long.parseLong"
...
* commit 'c680bab3315de2f6af14c1e9fcd3aaf63fa15848':
Parse UUID string with Long.parseLong
2013-12-11 22:02:36 +00:00
Narayan Kamath
d775ed03ed
am 78168595: am 007f3cf5: am bb349cdb: Merge "Add libutils dependency for libandroidfw host build."
...
* commit '78168595070f04aaa0d788b90009b1402c354775':
Add libutils dependency for libandroidfw host build.
2013-12-11 22:02:31 +00:00
Narayan Kamath
0bc3607c28
am 9f09408e: am 336bf2fb: am d21752df: Merge "Reimplement ZipFileRO in terms of libziparchive."
...
* commit '9f09408e3939c5afdb3f9dafc41afd249303ed7f':
Reimplement ZipFileRO in terms of libziparchive.
2013-12-11 22:02:25 +00:00
Elliott Hughes
e2fbb2ac68
am d3dd83c6: am 5b9437df: am 4a72b306: Merge "fix possible buffer overrun and memory leak"
...
* commit 'd3dd83c67a216f91654aa7d007c92eb82f567528':
fix possible buffer overrun and memory leak
2013-12-11 22:02:20 +00:00
Scott Main
5f41b262a5
am aec930b2: am f70d7b9a: am cf5ed42f: am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps
...
* commit 'aec930b2c6c7e9ad2a7808a1636f7c0fae0164af':
rewrite intent guide and add doc with intents supported by platform apps
2013-12-11 22:02:15 +00:00
Nick Kralevich
a64163093e
am 1e137549: am efa5c88f: Merge "Don\'t try to set service.bootanim.exit"
...
* commit '1e137549fea552377b53c642518af0201e85cafe':
Don't try to set service.bootanim.exit
2013-12-11 22:00:56 +00:00
Baligh Uddin
dd914cc253
am 5d819bef: (-s ours) am 32aa8222: (-s ours) am 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '5d819bef3f4bf97c87032cc403e859b1d0d6797a':
Import translations. DO NOT MERGE
2013-12-11 22:00:51 +00:00
Baligh Uddin
ac7737fc99
am 6a8b1691: (-s ours) am e30461c0: (-s ours) am 60835d4b: (-s ours) Import translations. DO NOT MERGE
...
* commit '6a8b169118e4c3df80a800f28f32ad9ec61260ce':
Import translations. DO NOT MERGE
2013-12-11 22:00:47 +00:00
Nick Kralevich
1e137549fe
am efa5c88f: Merge "Don\'t try to set service.bootanim.exit"
...
* commit 'efa5c88f37165d02e3e11882026c7660c879ff61':
Don't try to set service.bootanim.exit
2013-12-11 13:53:29 -08:00
Baligh Uddin
5d819bef3f
am 32aa8222: (-s ours) am 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '32aa82223a5e0e5475df81378d0e6715601b2cc2':
Import translations. DO NOT MERGE
2013-12-11 13:52:06 -08:00
Baligh Uddin
6a8b169118
am e30461c0: (-s ours) am 60835d4b: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e30461c07676496e9f848c6ea35e70583cec5949':
Import translations. DO NOT MERGE
2013-12-11 13:52:01 -08:00
Baligh Uddin
32aa82223a
am 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '0a102150448747bcedcd3276740e1adb8130ae03':
Import translations. DO NOT MERGE
2013-12-11 13:46:35 -08:00
Baligh Uddin
e30461c076
am 60835d4b: (-s ours) Import translations. DO NOT MERGE
...
* commit '60835d4be46caff5d5b62ffb19031b580d42b504':
Import translations. DO NOT MERGE
2013-12-11 13:46:31 -08:00
Nick Kralevich
efa5c88f37
Merge "Don't try to set service.bootanim.exit"
2013-12-11 21:46:08 +00:00
Baligh Uddin
0a10215044
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-12-11 21:32:53 +00:00
Nick Kralevich
e58d09a552
Don't try to set service.bootanim.exit
...
init has never allowed the bootanimation code to
set service.bootanim.exit, and has always generated the
dmesg error message
<3>[ 17.644615] init: sys_prop: permission denied uid:1003 name:service.bootanim.exit
Since setting this property has no effect and never worked, delete
the code which tries to do it.
Change-Id: Idacc5467d85479a8cf974702af8895011be585ea
2013-12-11 13:10:55 -08:00
Marco Nelissen
c680bab331
am 69b46707: am ce3bd309: Merge "Parse UUID string with Long.parseLong"
...
* commit '69b4670730ec557af6dc67f6c42aff20e5b0b86a':
Parse UUID string with Long.parseLong
2013-12-11 21:02:37 +00:00
Narayan Kamath
7816859507
am 007f3cf5: am bb349cdb: Merge "Add libutils dependency for libandroidfw host build."
...
* commit '007f3cf55980e3615bf7fb4fcabde279dde02853':
Add libutils dependency for libandroidfw host build.
2013-12-11 21:02:27 +00:00
Narayan Kamath
9f09408e39
am 336bf2fb: am d21752df: Merge "Reimplement ZipFileRO in terms of libziparchive."
...
* commit '336bf2fb497fece49a874da2ca2e11572446d1d1':
Reimplement ZipFileRO in terms of libziparchive.
2013-12-11 21:02:08 +00:00
Elliott Hughes
d3dd83c67a
am 5b9437df: am 4a72b306: Merge "fix possible buffer overrun and memory leak"
...
* commit '5b9437df99b0351d7e94a61c9f599d9031f24c08':
fix possible buffer overrun and memory leak
2013-12-11 21:02:00 +00:00
Scott Main
aec930b2c6
am f70d7b9a: am cf5ed42f: am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps
...
* commit 'f70d7b9aced31b978b63c4cfb2a5efee31436ba8':
rewrite intent guide and add doc with intents supported by platform apps
2013-12-11 21:01:55 +00:00
Baligh Uddin
9ad3907169
Import translations. DO NOT MERGE
...
Change-Id: I3065b51a4d5b72fc2dbd65f34f2b7dec89fb37d7
Auto-generated-cl: translation import
2013-12-11 12:55:02 -08:00
Baligh Uddin
60835d4be4
Import translations. DO NOT MERGE
...
Change-Id: Ifd2fd893861b827395080d8bfde873be9c0e7425
Auto-generated-cl: translation import
2013-12-11 12:46:13 -08:00