summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* Revert "Gets the URL that has a cert error and carrys it in SslError."Huahui Wu2011-06-282-68/+5
* Gets the URL that has a cert error and carrys it in SslError.Huahui Wu2011-06-272-5/+68
* Merge "Fix issue #4770360: older app compatibility mode is really tiny on ICS...Dianne Hackborn2011-06-234-36/+64
|\
| * Fix issue #4770360: older app compatibility mode is really tiny on ICS phonesDianne Hackborn2011-06-234-36/+64
* | Handle baseline aligned rows in which some components define baseline and som...Philip Milne2011-06-231-18/+63
* | am 1cc0fa41: am db45e0bd: am ecce539f: Merge "Release wakelock after use" int...Irfan Sheriff2011-06-231-1/+9
|\ \
| * \ am db45e0bd: am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2Irfan Sheriff2011-06-221-1/+9
| |\ \
| | * \ am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2Irfan Sheriff2011-06-221-1/+9
| | |\ \
| | | * | Release wakelock after useIrfan Sheriff2011-06-211-1/+9
| * | | | am 38053dad: am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration han...Irfan Sheriff2011-06-221-7/+18
| |\ \ \ \ | | |/ / /
| | * | | am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling""Irfan Sheriff2011-06-221-7/+18
| | |\ \ \ | | | |/ /
| | | * | Revert "DO NOT MERGE Revert "Fix lease duration handling""Irfan Sheriff2011-06-211-7/+18
| * | | | am cf99765b: resolved conflicts for merge of 914ed90f to honeycomb-LTEIrfan Sheriff2011-06-222-0/+363
| |\ \ \ \ | | |/ / /
| | * | | resolved conflicts for merge of 914ed90f to honeycomb-LTEIrfan Sheriff2011-06-222-0/+363
| | |\ \ \ | | | |/ /
| | | * | Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""Irfan Sheriff2011-06-212-0/+363
| * | | | am 5d5b73be: Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE...Irfan Sheriff2011-06-222-363/+0
| |\ \ \ \ | | |/ / /
| | * | | resolved conflicts for merge of 267a6181 to honeycomb-LTEIrfan Sheriff2011-06-222-363/+0
| | |\ \ \ | | | |/ /
| | | * | DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"Irfan Sheriff2011-06-212-363/+0
| * | | | am 885c3c11: am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration hand...Irfan Sheriff2011-06-211-18/+7
| |\ \ \ \ | | |/ / /
| | * | | am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into h...Irfan Sheriff2011-06-211-18/+7
| | |\ \ \ | | | |/ /
| | | * | DO NOT MERGE Revert "Fix lease duration handling"Irfan Sheriff2011-06-211-18/+7
* | | | | Add onSurfaceTextureUpdated to the TextureView listener.Grace Kloba2011-06-221-2/+18
* | | | | Merge "Enable bandwidth module from stats service."Jeff Sharkey2011-06-222-0/+4
|\ \ \ \ \
| * | | | | Enable bandwidth module from stats service.Jeff Sharkey2011-06-222-0/+4
* | | | | | Fix bug 4887033 - android.app.cts.AlertDialog_BuilderTest#testDisableCancelableAdam Powell2011-06-221-1/+4
* | | | | | Merge "Tweak action bar metrics."Adam Powell2011-06-221-2/+37
|\ \ \ \ \ \
| * | | | | | Tweak action bar metrics.Adam Powell2011-06-221-2/+37
* | | | | | | Merge "Prevent possible NPE in TextureView"Romain Guy2011-06-221-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Prevent possible NPE in TextureViewRomain Guy2011-06-221-1/+1
* | | | | | | | Merge "Add the ability to specify the opacity of a TextureView"Romain Guy2011-06-226-34/+63
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | Add the ability to specify the opacity of a TextureViewRomain Guy2011-06-226-34/+63
* | | | | | | resolved conflicts for merge of 6ce70394 to masterNick Pelly2011-06-221-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am 6f1a8edc: am 17523abb: NFC Adapter Extras API update.Nick Pelly2011-06-201-3/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ am 17523abb: NFC Adapter Extras API update.Nick Pelly2011-06-201-3/+1
| | |\ \ \ \ \ \
| | | * | | | | | NFC Adapter Extras API update.Nick Pelly2011-06-171-3/+1
* | | | | | | | | Merge "Update LockScreen layouts to latest UX spec."Jim Miller2011-06-221-42/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update LockScreen layouts to latest UX spec.Jim Miller2011-06-221-42/+46
* | | | | | | | | | Merge "Use local variable instead of webview method."Shimeng (Simon) Wang2011-06-221-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use local variable instead of webview method.Shimeng (Simon) Wang2011-06-221-1/+1
* | | | | | | | | | | Merge "Fix flashing artifacts caused by invalidation bugs"Chet Haase2011-06-221-2/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix flashing artifacts caused by invalidation bugsChet Haase2011-06-221-2/+11
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Get the profile proxies after the BT Service is up.Jaikumar Ganesh2011-06-221-1/+1
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge "Collapse UI events in TextureView."Romain Guy2011-06-221-18/+19
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Collapse UI events in TextureView.Romain Guy2011-06-221-18/+19
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge "resolved conflicts for merge of 7a652bc8 to master"Robert Greenwalt2011-06-221-0/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | resolved conflicts for merge of 7a652bc8 to masterRobert Greenwalt2011-06-221-0/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / /
| | * | | | | | resolved conflicts for merge of b427f0e6 to honeycomb-plus-aospRobert Greenwalt2011-06-201-0/+6
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Fix tethering upstream determination.Robert Greenwalt2011-06-201-0/+6
* | | | | | | | Merge "JniUtil depends on webcore native library and should not depend on oth...Brian Carlstrom2011-06-221-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | JniUtil depends on webcore native library and should not depend on others to ...Brian Carlstrom2011-06-221-0/+4