Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Fix issue #4770360: older app compatibility mode is really tiny on ICS... | Dianne Hackborn | 2011-06-23 | 4 | -36/+64 |
|\ | |||||
| * | Fix issue #4770360: older app compatibility mode is really tiny on ICS phones | Dianne Hackborn | 2011-06-23 | 4 | -36/+64 |
* | | Handle baseline aligned rows in which some components define baseline and som... | Philip Milne | 2011-06-23 | 1 | -18/+63 |
* | | am 1cc0fa41: am db45e0bd: am ecce539f: Merge "Release wakelock after use" int... | Irfan Sheriff | 2011-06-23 | 1 | -1/+9 |
|\ \ | |||||
| * \ | am db45e0bd: am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2 | Irfan Sheriff | 2011-06-22 | 1 | -1/+9 |
| |\ \ | |||||
| | * \ | am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2 | Irfan Sheriff | 2011-06-22 | 1 | -1/+9 |
| | |\ \ | |||||
| | | * | | Release wakelock after use | Irfan Sheriff | 2011-06-21 | 1 | -1/+9 |
| * | | | | am 38053dad: am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration han... | Irfan Sheriff | 2011-06-22 | 1 | -7/+18 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling"" | Irfan Sheriff | 2011-06-22 | 1 | -7/+18 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Revert "DO NOT MERGE Revert "Fix lease duration handling"" | Irfan Sheriff | 2011-06-21 | 1 | -7/+18 |
| * | | | | am cf99765b: resolved conflicts for merge of 914ed90f to honeycomb-LTE | Irfan Sheriff | 2011-06-22 | 2 | -0/+363 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | resolved conflicts for merge of 914ed90f to honeycomb-LTE | Irfan Sheriff | 2011-06-22 | 2 | -0/+363 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"" | Irfan Sheriff | 2011-06-21 | 2 | -0/+363 |
| * | | | | am 5d5b73be: Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE... | Irfan Sheriff | 2011-06-22 | 2 | -363/+0 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | resolved conflicts for merge of 267a6181 to honeycomb-LTE | Irfan Sheriff | 2011-06-22 | 2 | -363/+0 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine" | Irfan Sheriff | 2011-06-21 | 2 | -363/+0 |
| * | | | | am 885c3c11: am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration hand... | Irfan Sheriff | 2011-06-21 | 1 | -18/+7 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into h... | Irfan Sheriff | 2011-06-21 | 1 | -18/+7 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | DO NOT MERGE Revert "Fix lease duration handling" | Irfan Sheriff | 2011-06-21 | 1 | -18/+7 |
* | | | | | Add onSurfaceTextureUpdated to the TextureView listener. | Grace Kloba | 2011-06-22 | 1 | -2/+18 |
* | | | | | Merge "Enable bandwidth module from stats service." | Jeff Sharkey | 2011-06-22 | 2 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Enable bandwidth module from stats service. | Jeff Sharkey | 2011-06-22 | 2 | -0/+4 |
* | | | | | | Fix bug 4887033 - android.app.cts.AlertDialog_BuilderTest#testDisableCancelable | Adam Powell | 2011-06-22 | 1 | -1/+4 |
* | | | | | | Merge "Tweak action bar metrics." | Adam Powell | 2011-06-22 | 1 | -2/+37 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Tweak action bar metrics. | Adam Powell | 2011-06-22 | 1 | -2/+37 |
* | | | | | | | Merge "Prevent possible NPE in TextureView" | Romain Guy | 2011-06-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Prevent possible NPE in TextureView | Romain Guy | 2011-06-22 | 1 | -1/+1 |
* | | | | | | | | Merge "Add the ability to specify the opacity of a TextureView" | Romain Guy | 2011-06-22 | 6 | -34/+63 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Add the ability to specify the opacity of a TextureView | Romain Guy | 2011-06-22 | 6 | -34/+63 |
* | | | | | | | resolved conflicts for merge of 6ce70394 to master | Nick Pelly | 2011-06-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | am 6f1a8edc: am 17523abb: NFC Adapter Extras API update. | Nick Pelly | 2011-06-20 | 1 | -3/+1 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | am 17523abb: NFC Adapter Extras API update. | Nick Pelly | 2011-06-20 | 1 | -3/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | NFC Adapter Extras API update. | Nick Pelly | 2011-06-17 | 1 | -3/+1 |
* | | | | | | | | | Merge "Update LockScreen layouts to latest UX spec." | Jim Miller | 2011-06-22 | 1 | -42/+46 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update LockScreen layouts to latest UX spec. | Jim Miller | 2011-06-22 | 1 | -42/+46 |
* | | | | | | | | | | Merge "Use local variable instead of webview method." | Shimeng (Simon) Wang | 2011-06-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Use local variable instead of webview method. | Shimeng (Simon) Wang | 2011-06-22 | 1 | -1/+1 |
* | | | | | | | | | | | Merge "Fix flashing artifacts caused by invalidation bugs" | Chet Haase | 2011-06-22 | 1 | -2/+11 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix flashing artifacts caused by invalidation bugs | Chet Haase | 2011-06-22 | 1 | -2/+11 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Get the profile proxies after the BT Service is up. | Jaikumar Ganesh | 2011-06-22 | 1 | -1/+1 |
| |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge "Collapse UI events in TextureView." | Romain Guy | 2011-06-22 | 1 | -18/+19 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Collapse UI events in TextureView. | Romain Guy | 2011-06-22 | 1 | -18/+19 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge "resolved conflicts for merge of 7a652bc8 to master" | Robert Greenwalt | 2011-06-22 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | resolved conflicts for merge of 7a652bc8 to master | Robert Greenwalt | 2011-06-22 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / / | |||||
| | * | | | | | | resolved conflicts for merge of b427f0e6 to honeycomb-plus-aosp | Robert Greenwalt | 2011-06-20 | 1 | -0/+6 |
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | |||||
| | | * | | | | | Fix tethering upstream determination. | Robert Greenwalt | 2011-06-20 | 1 | -0/+6 |
* | | | | | | | | Merge "JniUtil depends on webcore native library and should not depend on oth... | Brian Carlstrom | 2011-06-22 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | JniUtil depends on webcore native library and should not depend on others to ... | Brian Carlstrom | 2011-06-22 | 1 | -0/+4 |
* | | | | | | | | | Merge "Fix bug 4807086 - Options menu panel too narrow in landscape" | Adam Powell | 2011-06-22 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix bug 4807086 - Options menu panel too narrow in landscape | Adam Powell | 2011-06-22 | 1 | -2/+1 |
| | |/ / / / / / / | |/| | | | | | | |