summaryrefslogtreecommitdiffstats
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
* Create telephony-common and mms-common - DO NOT MERGEWink Saville2012-07-173-2090/+52
* am dc99555d: Merge "Pass SearchView suggestion cursor exception to Log."Romain Guy2012-07-061-2/+2
|\
| * Pass SearchView suggestion cursor exception to Log.Jake Wharton2012-07-061-2/+2
* | am fd516987: docs: misc bugs from external trackerScott Main2012-07-031-1/+1
|\ \
| * | docs: misc bugs from external trackerScott Main2012-07-031-1/+1
* | | am 5a883824: Merge "docs: fix document issue 27549" into jb-devScott Main2012-07-032-10/+10
|\ \ \ | |/ /
| * | Merge "docs: fix document issue 27549" into jb-devScott Main2012-07-032-10/+10
| |\ \
| | * | docs: fix document issue 27549Scott Main2012-07-022-10/+10
* | | | am 399df567: docs: various link fixes and other typos from external trackerScott Main2012-07-024-10/+0
|\ \ \ \ | |/ / /
| * | | docs: various link fixes and other typos from external trackerScott Main2012-07-024-10/+0
| |/ /
* | | Enhance StateMachine Quitting and logging support. DO NOT MERGEWink Saville2012-07-023-25/+42
* | | am 1598a508: Merge "Do not back up / restore the rotation-related settings" i...Christopher Tate2012-06-291-3/+0
|\ \ \ | |/ /
| * | Merge "Do not back up / restore the rotation-related settings" into jb-devChristopher Tate2012-06-291-3/+0
| |\ \
| | * | Do not back up / restore the rotation-related settingsChristopher Tate2012-06-291-3/+0
* | | | am 074b54fb: Merge "Maybe fix issue #6756472: Share button is not defocusing ...Dianne Hackborn2012-06-281-36/+33
|\ \ \ \ | |/ / /
| * | | Maybe fix issue #6756472: Share button is not defocusing the shadeDianne Hackborn2012-06-281-36/+33
* | | | am 98fd6405: Merge "Fix NPEs when using the APIs a little oddly." into jb-devMike Cleron2012-06-281-2/+6
|\ \ \ \ | |/ / /
| * | | Merge "Fix NPEs when using the APIs a little oddly." into jb-devMike Cleron2012-06-281-2/+6
| |\ \ \ | | |/ / | |/| |
| | * | Fix NPEs when using the APIs a little oddly.Daniel Sandler2012-06-281-2/+6
* | | | am 29775794: Merge "Get rid of the extra bt_disable call when turning on airp...Matthew Xie2012-06-271-5/+2
|\ \ \ \ | |/ / /
| * | | Merge "Get rid of the extra bt_disable call when turning on airplane mode Get...Matthew Xie2012-06-271-5/+2
| |\ \ \
| | * | | Get rid of the extra bt_disable call when turning on airplane modeMatthew Xie2012-06-271-5/+2
* | | | | am cdb3f9c4: Merge "docs: add api overview for jb" into jb-devScott Main2012-06-261-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "docs: add api overview for jb" into jb-devScott Main2012-06-261-1/+1
| |\ \ \ \
| | * | | | docs: add api overview for jbScott Main2012-06-261-1/+1
* | | | | | am 17990395: Merge "Fix issue #6717667: expanded notification actions don\'t ...Dianne Hackborn2012-06-255-57/+106
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix issue #6717667: expanded notification actions don't work on the lo...Dianne Hackborn2012-06-255-57/+106
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix issue #6717667: expanded notification actions don't work on the lock screenDianne Hackborn2012-06-255-57/+106
* | | | | | am 806a3602: Merge "Update documentation on max widget bitmap usage" into jb-devMichael Jurka2012-06-251-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Update documentation on max widget bitmap usage" into jb-devMichael Jurka2012-06-251-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Update documentation on max widget bitmap usageMichael Jurka2012-06-251-2/+2
* | | | | | am e9b4b3e9: Merge "docs: clean up javadoc code snippets, unescaped entities"...Scott Main2012-06-251-42/+31
|\ \ \ \ \ \ | |/ / / / /
| * | | | | docs: clean up javadoc code snippets, unescaped entitiesScott Main2012-06-251-42/+31
| | |_|/ / | |/| | |
* | | | | resolved conflicts for merge of f8f76d52 to jb-dev-plus-aospJean-Baptiste Queru2012-06-232-2/+14
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge "Add the possibility to modify the View focus rect"Jean-Baptiste Queru2012-06-232-2/+14
| |\ \ \ \
| | * | | | Add the possibility to modify the View focus rectTobias Dubois2012-06-052-2/+14
* | | | | | am fd3fd482: Merge "Update route count properly when MediaRouteButton detects...Adam Powell2012-06-231-0/+11
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Update route count properly when MediaRouteButton detectsAdam Powell2012-06-221-0/+11
* | | | | | am 9be0105f: docs: fix several linksScott Main2012-06-229-9/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | docs: fix several linksScott Main2012-06-229-9/+9
* | | | | | am 3cd46244: Merge "Avoid memory leak by only registering callback while atta...Adam Powell2012-06-221-2/+32
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Avoid memory leak by only registering callback while attached to windo...Adam Powell2012-06-221-2/+32
| |\ \ \ \ \
| | * | | | | Avoid memory leak by only registering callback while attached to window.Jack Palevich2012-06-221-2/+32
* | | | | | | am 95cf8c11: Merge "Allow ungrouping media routes when a group is the only al...Adam Powell2012-06-211-2/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Allow ungrouping media routes when a group is the only alternate routeAdam Powell2012-06-211-2/+8
* | | | | | | am a9543a3d: Merge "Pass additional inputs when spawning apps via the Zygote ...Kenny Root2012-06-211-1/+9
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge "Pass additional inputs when spawning apps via the Zygote and add SELin...Kenny Root2012-06-211-1/+9
| |\ \ \ \ \ \
| | * | | | | | Pass additional inputs when spawning apps via the Zygote and add SELinux perm...Stephen Smalley2012-04-021-1/+9
* | | | | | | | am d5353b47: Fix docsDaniel Sandler2012-06-211-1/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Fix docsDaniel Sandler2012-06-211-1/+1