Jeff Hamilton
1bb4e30bcd
am 3d45b1d6: am c88d3296: am 329b760e: Revert "Change the name of the location config value."
...
* commit '3d45b1d6b88dafcae24485dd853d3a919c12a497':
Revert "Change the name of the location config value."
2012-10-05 00:52:25 -07:00
Jeff Hamilton
3d45b1d6b8
am c88d3296: am 329b760e: Revert "Change the name of the location config value."
...
* commit 'c88d3296f4fc308559e3747a38f2b499336dfe49':
Revert "Change the name of the location config value."
2012-10-05 00:50:54 -07:00
Jeff Hamilton
c88d3296f4
am 329b760e: Revert "Change the name of the location config value."
...
* commit '329b760e8e1adb6551ec6d3f49866ec0a726a96d':
Revert "Change the name of the location config value."
2012-10-05 00:48:39 -07:00
Jeff Hamilton
329b760e8e
Revert "Change the name of the location config value."
...
This reverts commit c3e2dac377 .
2012-10-05 02:30:33 -05:00
Jeff Hamilton
d7bf655b7c
am 338a9c30: am c741bb54: am c3e2dac3: Change the name of the location config value.
...
* commit '338a9c30bb545ef8bd070b6d613a7617ea7189dd':
Change the name of the location config value.
2012-10-04 19:34:12 -07:00
Jeff Hamilton
338a9c30bb
am c741bb54: am c3e2dac3: Change the name of the location config value.
...
* commit 'c741bb54b03d69f42a653149a0701f1f60430927':
Change the name of the location config value.
2012-10-04 18:28:01 -07:00
Jeff Hamilton
c741bb54b0
am c3e2dac3: Change the name of the location config value.
...
* commit 'c3e2dac3773acbf46d01d768430e394ec79d4269':
Change the name of the location config value.
2012-10-04 18:25:47 -07:00
Jeff Hamilton
c3e2dac377
Change the name of the location config value.
...
Bug: 7242814
Change-Id: I96867f8c2ed886ea6895849c057fc0e37813ce47
2012-10-04 11:00:40 -05:00
The Android Open Source Project
f62508b134
am fbe1ff36: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'fbe1ff366ff80c2dc4543ada8b958848c2649dcc':
2012-10-04 07:49:42 -07:00
The Android Open Source Project
fbe1ff366f
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ia1e6413d3d45634a4b91dc8a528c991a05ec3627
2012-10-04 07:47:32 -07:00
The Android Automerger
1c723d9eac
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-04 06:59:20 -07:00
Joe Fernandez
0e97a427c5
am e8b88b72: am b842d103: am 177c547e: am 835ae05a: am 8ffbb8fd: am 6a705429: docs: Add redirect for Android Open Accessory protocol content to source.android.com
...
* commit 'e8b88b72bdb9a99f58f6f5a289b307aad56ea374':
docs: Add redirect for Android Open Accessory protocol content to source.android.com
2012-10-03 16:34:28 -07:00
Joe Fernandez
e8b88b72bd
am b842d103: am 177c547e: am 835ae05a: am 8ffbb8fd: am 6a705429: docs: Add redirect for Android Open Accessory protocol content to source.android.com
...
* commit 'b842d103e02cffdf0221fd20483256a6f5c678eb':
docs: Add redirect for Android Open Accessory protocol content to source.android.com
2012-10-03 16:30:52 -07:00
Joe Fernandez
b842d103e0
am 177c547e: am 835ae05a: am 8ffbb8fd: am 6a705429: docs: Add redirect for Android Open Accessory protocol content to source.android.com
...
* commit '177c547e323264625c9a546e99819d39419b267c':
docs: Add redirect for Android Open Accessory protocol content to source.android.com
2012-10-03 16:28:52 -07:00
Joe Fernandez
177c547e32
am 835ae05a: am 8ffbb8fd: am 6a705429: docs: Add redirect for Android Open Accessory protocol content to source.android.com
...
* commit '835ae05aff3d65cdd14344c8183d52e7bfe5cbc7':
docs: Add redirect for Android Open Accessory protocol content to source.android.com
2012-10-03 16:27:19 -07:00
Joe Fernandez
835ae05aff
am 8ffbb8fd: am 6a705429: docs: Add redirect for Android Open Accessory protocol content to source.android.com
...
* commit '8ffbb8fdd6e75e3067bed62487acfab91c14fcb2':
docs: Add redirect for Android Open Accessory protocol content to source.android.com
2012-10-03 16:24:42 -07:00
Joe Fernandez
8ffbb8fdd6
am 6a705429: docs: Add redirect for Android Open Accessory protocol content to source.android.com
...
* commit '6a705429d4a70d1d75adec16499bbcd18ee9a019':
docs: Add redirect for Android Open Accessory protocol content to source.android.com
2012-10-03 16:21:30 -07:00
Joe Fernandez
6a705429d4
docs: Add redirect for Android Open Accessory protocol content to
...
source.android.com
Change-Id: Ibe6cca5848564a6a5e32ed742a49b26e36754dcb
2012-10-03 16:04:10 -07:00
Jean-Baptiste Queru
ebf1862d0e
am 72b2575e: (-s ours) am 6dd8880c: (-s ours) Reconcile with jb-dev - do not merge
...
* commit '72b2575effe57fd99d4dd0eb665daa0f89eef912':
2012-10-03 15:25:44 -07:00
Jean-Baptiste Queru
72b2575eff
am 6dd8880c: (-s ours) Reconcile with jb-dev - do not merge
...
* commit '6dd8880cc9efb5c1152717cc2dead62c7d3adcb8':
2012-10-03 15:23:35 -07:00
Jean-Baptiste Queru
6dd8880cc9
Reconcile with jb-dev - do not merge
...
Change-Id: Ie0ff01ab85c75e2dc14c12c14ff641aa4cf54b58
2012-10-03 15:22:04 -07:00
The Android Open Source Project
2c590655f9
am 0f929c09: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '0f929c09897e61161b92548b9c2f30a165973e3f':
2012-10-03 07:34:40 -07:00
The Android Open Source Project
0f929c0989
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Idc1f130f1db6f6312680a512439eb7a7a0a5110e
2012-10-03 07:33:18 -07:00
The Android Automerger
6aa2a9c781
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-03 06:59:19 -07:00
Andy Stadler
a703665865
am e3ab405b: (-s ours) am 7b920976: am de479873: Classpath cleanups - DO NOT MERGE
...
* commit 'e3ab405b315feaf90da714e3b5c1e705caa479fe':
Classpath cleanups - DO NOT MERGE
2012-10-02 21:33:16 -07:00
Andy Stadler
e3ab405b31
am 7b920976: am de479873: Classpath cleanups - DO NOT MERGE
...
* commit '7b920976c774b69f80592b60718960d21faec2a7':
Classpath cleanups - DO NOT MERGE
2012-10-02 21:31:45 -07:00
Andy Stadler
7b920976c7
am de479873: Classpath cleanups - DO NOT MERGE
...
* commit 'de479873e52e2e941e9b25cdaa7234a8ff5ade55':
Classpath cleanups - DO NOT MERGE
2012-10-02 21:29:55 -07:00
Andy Stadler
de479873e5
Classpath cleanups - DO NOT MERGE
...
* Add external/mp4parser
* Cleanup after Email rewinding
This does not affect system image builds at all - just fixes eclipse
workspace so there are no errors reported.
Change-Id: I2aee831e460b4acb63b2b999bab4131a08af6bd9
2012-10-02 16:40:54 -07:00
The Android Open Source Project
a42df017bd
am bd219806: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'bd219806c37a38825fb89c889396c80a6445554a':
2012-10-02 09:18:53 -07:00
The Android Open Source Project
bd219806c3
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I92e095e0ea2a4ce39286a4b132d2ae0c68eb5e7a
2012-10-02 09:17:01 -07:00
The Android Automerger
071fde625a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-30 06:59:19 -07:00
Jean-Baptiste Queru
c3dde82321
am ea54f651: Merge from jb-mr1-aah-dev
...
* commit 'ea54f651b0210d003ff5137d7ef7b34bc7677349':
2012-09-28 17:13:04 -07:00
Jean-Baptiste Queru
ea54f651b0
Merge from jb-mr1-aah-dev
...
Change-Id: I63e57aae9dc8c0efe990c848298d7d00e0060197
2012-09-28 17:08:13 -07:00
Baligh Uddin
24c6519f95
am 0eedcba2: am 6b03c84e: Use more secure exponent for generating keys
...
* commit '0eedcba2f5922b841c01d4188f9fcea97d6b258b':
Use more secure exponent for generating keys
2012-09-28 15:52:44 -07:00
Baligh Uddin
97b8be9b31
am 6b03c84e: Use more secure exponent for generating keys
...
* commit '6b03c84e6ec660884d3cc216302b5f462bb1ce65':
Use more secure exponent for generating keys
2012-09-28 14:48:19 -07:00
Baligh Uddin
0eedcba2f5
am 6b03c84e: Use more secure exponent for generating keys
...
* commit '6b03c84e6ec660884d3cc216302b5f462bb1ce65':
Use more secure exponent for generating keys
2012-09-28 14:47:44 -07:00
Jean-Baptiste Queru
4954c1ef3e
am 1466bf7a: Merge from jb-mr1-aah-dev
...
* commit '1466bf7a363aa472bd7e9e4608fa46a0c36251b1':
Import translations. DO NOT MERGE
2012-09-28 13:31:15 -07:00
Jean-Baptiste Queru
1466bf7a36
Merge from jb-mr1-aah-dev
...
Change-Id: I0930df5393313f0cba4a30f7b30506e751022a91
2012-09-28 13:26:31 -07:00
Baligh Uddin
6b03c84e6e
Use more secure exponent for generating keys
...
Bug: 7246090
Change-Id: Ic6cbac975fcb96b436e27a87b1f81b5e3dac6321
2012-09-28 11:30:10 -07:00
The Android Open Source Project
7cc92cc7e4
am e3dd9f0b: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'e3dd9f0b0853a8c0fa6270a430f10512d81b1b05':
2012-09-28 00:32:21 -07:00
The Android Open Source Project
e3dd9f0b08
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I86b0f44dc30be99464eb2a1d6891798cd1b14250
2012-09-27 09:57:11 -07:00
The Android Automerger
708cf98801
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-27 06:59:22 -07:00
Jeff Sharkey
9750c02285
am 652f9784: am 7b487466: Clean up Global settings stragglers.
...
* commit '652f9784738c6cd77f323c97227f815cfd285fec':
Clean up Global settings stragglers.
2012-09-26 20:21:20 -07:00
Jeff Sharkey
cc9e74e1b5
am 7b487466: Clean up Global settings stragglers.
...
* commit '7b4874660e94685b76828e1f93b651ac38742bd7':
Clean up Global settings stragglers.
2012-09-26 20:17:16 -07:00
Jeff Sharkey
652f978473
am 7b487466: Clean up Global settings stragglers.
...
* commit '7b4874660e94685b76828e1f93b651ac38742bd7':
Clean up Global settings stragglers.
2012-09-26 20:16:51 -07:00
Jeff Sharkey
7b4874660e
Clean up Global settings stragglers.
...
Bug: 7242121
Change-Id: I27fd307e2ee4854558a6f6e4d2fdbbae3e89ffe0
2012-09-26 17:10:48 -07:00
Andrew Hsieh
03f0cea60b
am 4d6e7a3b: am 24e005a2: am c7daea04: Merge "Replace __unused in linux/sysctl.h with __linux_unused"
...
* commit '4d6e7a3b9f929767596c5a77781a9fa7d1fd9706':
Replace __unused in linux/sysctl.h with __linux_unused
2012-09-26 15:52:19 -07:00
Andrew Hsieh
4d6e7a3b9f
am 24e005a2: am c7daea04: Merge "Replace __unused in linux/sysctl.h with __linux_unused"
...
* commit '24e005a234eae1def238e4521481e7399b880bf6':
Replace __unused in linux/sysctl.h with __linux_unused
2012-09-26 15:50:00 -07:00
Andrew Hsieh
24e005a234
am c7daea04: Merge "Replace __unused in linux/sysctl.h with __linux_unused"
...
* commit 'c7daea046b9f05fb07936bafd2f7436478781a2d':
Replace __unused in linux/sysctl.h with __linux_unused
2012-09-26 15:48:00 -07:00
Andrew Hsieh
c7daea046b
Merge "Replace __unused in linux/sysctl.h with __linux_unused"
2012-09-26 15:32:50 -07:00