summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Make the interface with DHCP IPv6 capable.Robert Greenwalt2011-01-264-47/+155
* am f2b7c844: am 8d37c4ef: Merge "Tracking jarjar of org.bouncycastle to com.a...Brian Carlstrom2011-01-254-9/+9
|\
| * am 8d37c4ef: Merge "Tracking jarjar of org.bouncycastle to com.android.org.bo...Brian Carlstrom2011-01-254-9/+9
| |\
| | * Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" i...Brian Carlstrom2011-01-254-9/+9
| | |\
| | | * Tracking jarjar of org.bouncycastle to com.android.org.bouncycastleBrian Carlstrom2011-01-244-9/+9
* | | | am 894983f0: am 3b61e47a: am b134223f: Make Mifare Classic increment/decremen...Nick Pelly2011-01-251-2/+13
|\ \ \ \ | |/ / /
| * | | am 3b61e47a: am b134223f: Make Mifare Classic increment/decrement operands li...Nick Pelly2011-01-251-2/+13
| |\ \ \
| | * \ \ am b134223f: Make Mifare Classic increment/decrement operands little endianNick Pelly2011-01-251-2/+13
| | |\ \ \
| | | * | | Make Mifare Classic increment/decrement operands little endianNick Pelly2011-01-251-2/+13
| | * | | | am 28c4f69a: Updated checkbox assetsJustin Ho2011-01-2420-0/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | Updated checkbox assetsJustin Ho2011-01-2420-0/+0
* | | | | | am 9eaa9b97: am b6b15dca: Merge "TextLine cache is used, even for long lines ...Gilles Debunne2011-01-251-7/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am b6b15dca: Merge "TextLine cache is used, even for long lines of text." int...Gilles Debunne2011-01-251-7/+5
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "TextLine cache is used, even for long lines of text." into honeycombGilles Debunne2011-01-251-7/+5
| | |\ \ \ \
| | | * | | | TextLine cache is used, even for long lines of text.Gilles Debunne2011-01-251-7/+5
* | | | | | | am 1dc6b9eb: am c1e7f2d3: Merge "Set high usage delta to 1 to avoid constant ...Shimeng (Simon) Wang2011-01-251-5/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c1e7f2d3: Merge "Set high usage delta to 1 to avoid constant V8 GC." into ...Shimeng (Simon) Wang2011-01-251-5/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Set high usage delta to 1 to avoid constant V8 GC." into honeycombShimeng (Simon) Wang2011-01-251-5/+9
| | |\ \ \ \ \
| | | * | | | | Set high usage delta to 1 to avoid constant V8 GC.Shimeng (Simon) Wang2011-01-251-5/+9
| | | |/ / / /
* | | | | | | am 0d128912: am 10ab8617: am 5e81a6e2: Fix trace mismatch.Arnaud Ferir2011-01-251-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 10ab8617: am 5e81a6e2: Fix trace mismatch.Arnaud Ferir2011-01-251-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | am 5e81a6e2: Fix trace mismatch.Arnaud Ferir2011-01-241-1/+1
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Fix trace mismatch.Arnaud Ferir2011-01-241-1/+1
* | | | | | | am a2eced30: am e97a42e0: am c5a418ec: Handle mock tags in android.nfc.Tag co...Sylvain Fonteneau2011-01-251-2/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am e97a42e0: am c5a418ec: Handle mock tags in android.nfc.Tag conversion to P...Sylvain Fonteneau2011-01-251-2/+16
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.Sylvain Fonteneau2011-01-241-2/+16
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Handle mock tags in android.nfc.Tag conversion to Parcel.Sylvain Fonteneau2011-01-241-2/+16
* | | | | | | am fd06cc10: resolved conflicts for merge of 0065f398 to honeycomb-plus-aospNick Pelly2011-01-251-12/+19
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | resolved conflicts for merge of 0065f398 to honeycomb-plus-aospNick Pelly2011-01-251-12/+19
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am c896d85c: Merge "Add operands to mifare classic increment, decrement." int...Nick Pelly2011-01-231-12/+19
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Add operands to mifare classic increment, decrement." into gingerbreadNick Pelly2011-01-231-12/+19
| | | |\ \ \ \
| | | | * | | | Add operands to mifare classic increment, decrement.Nick Pelly2011-01-231-12/+19
* | | | | | | | am bdd265ba: resolved conflicts for merge of 12619677 to honeycomb-plus-aospNick Pelly2011-01-251-189/+186
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | resolved conflicts for merge of 12619677 to honeycomb-plus-aospNick Pelly2011-01-251-189/+186
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am da01b4ab: Merge "Make MifareClassic methods more consistent." into gingerb...Nick Pelly2011-01-231-189/+186
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "Make MifareClassic methods more consistent." into gingerbreadNick Pelly2011-01-231-189/+186
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Make MifareClassic methods more consistent.Nick Pelly2011-01-231-189/+186
| * | | | | | | Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/framew...Nick Pelly2011-01-251-1/+21
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ am 883b26db: am 535ec16c: am e1e70c57: Merge "Allow null filters for foregrou...Jeff Hamilton2011-01-251-5/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 535ec16c: am e1e70c57: Merge "Allow null filters for foreground dispatch t...Jeff Hamilton2011-01-251-5/+11
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catc...Jeff Hamilton2011-01-231-5/+11
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge "Allow null filters for foreground dispatch to act as catch all." into ...Jeff Hamilton2011-01-231-5/+11
| | | |\ \ \ \ \ \
| | | | * | | | | | Allow null filters for foreground dispatch to act as catch all.Jeff Hamilton2011-01-231-5/+11
* | | | | | | | | | am 00e37916: am 1323ab83: am 42a46157: Fix 3379239: Catch exceptions from wor...Jim Miller2011-01-251-2/+10
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 1323ab83: am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM.Jim Miller2011-01-251-2/+10
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM.Jim Miller2011-01-231-2/+10
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Fix 3379239: Catch exceptions from workaround for OOM.Jim Miller2011-01-231-2/+10
| | | |/ / / / / /
| | * | | | | | | am 1c9761e3: Merge "Do Not Merge Connect other profiles when priority is auto...Jaikumar Ganesh2011-01-211-5/+9
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "Do Not Merge Connect other profiles when priority is auto connect." in...Jaikumar Ganesh2011-01-211-5/+9
| | | |\ \ \ \ \ \
| | | | * | | | | | Do Not Merge Connect other profiles when priority is auto connect.Jaikumar Ganesh2011-01-211-5/+9