summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Accessiiblity in right state upon connection of a test agent."Svetoslav Ganov2011-06-161-0/+8
|\
| * Accessiiblity in right state upon connection of a test agent.Svetoslav Ganov2011-06-161-0/+8
* | Merge "Prevent TweetDeck from crashing."Romain Guy2011-06-161-9/+12
|\ \
| * | Prevent TweetDeck from crashing.Romain Guy2011-06-161-9/+12
* | | Merge "Adds more docs to classes in CalendarContract"RoboErik2011-06-161-8/+50
|\ \ \
| * | | Adds more docs to classes in CalendarContractRoboErik2011-06-161-8/+50
* | | | Merge "Adding ability to read back fbo data to renderscript"Alex Sakhartchouk2011-06-1616-116/+1025
|\ \ \ \
| * | | | Adding ability to read back fbo data to renderscriptAlex Sakhartchouk2011-06-1616-116/+1025
* | | | | am 810dc598: am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only...Dianne Hackborn2011-06-161-8/+48
|\ \ \ \ \
| * \ \ \ \ am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only impacts SDK ...Dianne Hackborn2011-06-161-8/+48
| |\ \ \ \ \
| | * \ \ \ \ am abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt dump ba...Dianne Hackborn2011-06-161-8/+48
| | |\ \ \ \ \
| | | * \ \ \ \ Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into...Dianne Hackborn2011-06-161-8/+48
| | | |\ \ \ \ \
| | | | * | | | | New orientation handling. Only impacts SDK (aapt dump badging).Dianne Hackborn2011-06-161-8/+48
* | | | | | | | | am 9bf1a0c3: (-s ours) am 62385d5e: am 6b93f976: Merge "DO NOT MERGE" into ho...Robert Greenwalt2011-06-160-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 62385d5e: am 6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2Robert Greenwalt2011-06-160-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2Robert Greenwalt2011-06-160-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "DO NOT MERGE" into honeycomb-mr2Robert Greenwalt2011-06-161-7/+9
| | | |\ \ \ \ \ \
| | | | * | | | | | DO NOT MERGERobert Greenwalt2011-06-161-7/+9
| | | | |/ / / / /
* | | | | | | | | Merge "Update getLayoutDirectionFromLocale() for using ICU"Fabrice Di Meglio2011-06-162-14/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update getLayoutDirectionFromLocale() for using ICUFabrice Di Meglio2011-06-162-14/+3
* | | | | | | | | | Merge "Fix crash in ViewPropertyAnimator for unparented view."Chet Haase2011-06-161-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix crash in ViewPropertyAnimator for unparented view.Chet Haase2011-06-161-2/+2
* | | | | | | | | | | Merge branch 'master' of ssh://android-git:29418/platform/frameworks/baseXavier Ducrohet2011-06-161-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add permission to fix NetworkPolicy tests.Jeff Sharkey2011-06-161-0/+1
* | | | | | | | | | | | am 0be8522b: am d1abd94f: am 04ce8111: Bring in more layout lib changes from ...Xavier Ducrohet2011-06-1614-196/+328
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | / / / / / / / / | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am d1abd94f: am 04ce8111: Bring in more layout lib changes from hc-mr1.Xavier Ducrohet2011-06-1614-196/+328
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am 04ce8111: Bring in more layout lib changes from hc-mr1.Xavier Ducrohet2011-06-1614-196/+328
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Bring in more layout lib changes from hc-mr1.Xavier Ducrohet2011-06-1614-196/+328
| | | | |_|/ / / / / | | | |/| | | | | |
* | | | | | | | | | Merge "Add DroidDocs to Events class"RoboErik2011-06-161-1/+97
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Add DroidDocs to Events classRoboErik2011-06-161-1/+97
* | | | | | | | | | Merge "DownloadManager flags for network policy."Jeff Sharkey2011-06-166-5/+55
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | DownloadManager flags for network policy.Jeff Sharkey2011-06-166-5/+55
* | | | | | | | | | Merge "Inline SeekBarPreference"John Reck2011-06-166-46/+404
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Inline SeekBarPreferenceJohn Reck2011-06-166-46/+404
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | am 241b65ac: am 5f350512: Merge "Reset connections AFTER we take down the net...Robert Greenwalt2011-06-163-52/+40
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | am 5f350512: Merge "Reset connections AFTER we take down the network." into h...Robert Greenwalt2011-06-163-52/+40
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "Reset connections AFTER we take down the network." into honeycomb-LTERobert Greenwalt2011-06-163-52/+40
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Reset connections AFTER we take down the network.Robert Greenwalt2011-06-163-52/+40
* | | | | | | | | | | am 03cbb58e: am ff42c04d: Merge "Support SIM permanently disabled state." int...John Wang2011-06-1610-16/+118
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTEJohn Wang2011-06-1610-16/+118
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Support SIM permanently disabled state." into honeycomb-LTEJohn Wang2011-06-1610-16/+118
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Support SIM permanently disabled state.John Wang2011-06-1410-16/+118
* | | | | | | | | | | | am 35e6d686: (-s ours) am 0887b8c2: am 8e18668d: revert surfaceflinger leak f...Mathias Agopian2011-06-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 0887b8c2: am 8e18668d: revert surfaceflinger leak fix as it uncovered a cr...Mathias Agopian2011-06-156-90/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 8e18668d: revert surfaceflinger leak fix as it uncovered a crasher on xoom...Mathias Agopian2011-06-156-90/+10
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)Mathias Agopian2011-06-156-90/+10
* | | | | | | | | | | | am 552bd670: (-s ours) am d5244e0a: am 52a43990: Revert "revert surfaceflinge...Mathias Agopian2011-06-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am d5244e0a: am 52a43990: Revert "revert surfaceflinger leak fix as it uncove...Mathias Agopian2011-06-156-10/+90
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 52a43990: Revert "revert surfaceflinger leak fix as it uncovered a crasher...Mathias Agopian2011-06-156-10/+90
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"Mathias Agopian2011-06-156-10/+90
generated by cgit v1.1 at 2024-09-19 19:12:56 +0000