summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add docs for Calendars table"RoboErik2011-06-171-13/+106
|\
| * Add docs for Calendars tableRoboErik2011-06-171-13/+106
* | Merge "VPN: move VpnDialogs related methods into VpnConfig."Chia-chi Yeh2011-06-171-0/+28
|\ \
| * | VPN: move VpnDialogs related methods into VpnConfig.Chia-chi Yeh2011-06-171-0/+28
* | | Merge "Remove HanziToPinin.java"Daisuke Miyakawa2011-06-171-495/+0
|\ \ \
| * | | Remove HanziToPinin.javaDaisuke Miyakawa2011-06-161-495/+0
* | | | Merge "Bug 4726236 - NPE at dispatchRestoreInstanceState"Adam Powell2011-06-171-1/+3
|\ \ \ \
| * | | | Bug 4726236 - NPE at dispatchRestoreInstanceStateAdam Powell2011-06-171-1/+3
* | | | | Merge "Inform the InputMethodManager that a focused view has been attached."Amith Yamasani2011-06-171-0/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Inform the InputMethodManager that a focused view has been attached.Amith Yamasani2011-06-171-0/+4
* | | | | Merge "Add API for auto-complete ranking improvement."Daisuke Miyakawa2011-06-171-3/+0
|\ \ \ \ \
| * | | | | Add API for auto-complete ranking improvement.Daisuke Miyakawa2011-06-151-3/+0
* | | | | | Merge "Make textZoom public"John Reck2011-06-171-3/+6
|\ \ \ \ \ \
| * | | | | | Make textZoom publicJohn Reck2011-06-171-3/+6
* | | | | | | Merge "ICS updates to notification layouts."Daniel Sandler2011-06-171-5/+5
|\ \ \ \ \ \ \
| * | | | | | | ICS updates to notification layouts.Daniel Sandler2011-06-171-5/+5
* | | | | | | | Merge "Change includeMarginsInAlignment flag to aligmentMode property."Philip Milne2011-06-171-40/+78
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Change includeMarginsInAlignment flag to aligmentMode property.Philip Milne2011-06-161-40/+78
* | | | | | | | hide CalendarMetaDataColumnsRoboErik2011-06-171-2/+4
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge "Add textZoom setting"John Reck2011-06-171-8/+41
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add textZoom settingJohn Reck2011-06-171-8/+41
* | | | | | | Merge "Fix IP address cleanup on network disconnect"Irfan Sheriff2011-06-171-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Fix IP address cleanup on network disconnectIrfan Sheriff2011-06-171-0/+5
* | | | | | | | Merge "Mention device policay manager in Camera.open javadoc."Wu-cheng Li2011-06-171-1/+3
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Mention device policay manager in Camera.open javadoc.Wu-cheng Li2011-06-171-1/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge "Update GridLayout constructors to properly handle DEBUG=true"Jim Miller2011-06-161-7/+6
|\ \ \ \ \ \ \
| * | | | | | | Update GridLayout constructors to properly handle DEBUG=trueJim Miller2011-06-161-6/+5
* | | | | | | | Dialog-o-rama!Adam Powell2011-06-163-6/+14
* | | | | | | | Merge "resolved conflicts for merge of 872a1e79 to master"Dianne Hackborn2011-06-164-2/+44
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | resolved conflicts for merge of 872a1e79 to masterDianne Hackborn2011-06-164-2/+44
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ am 9a73c4d3: am 2f04883f: SDK only: integrate new sample code, deprecating al...Dianne Hackborn2011-06-164-2/+44
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ am 2f04883f: SDK only: integrate new sample code, deprecating along the way.Dianne Hackborn2011-06-164-2/+44
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | SDK only: integrate new sample code, deprecating along the way.Dianne Hackborn2011-06-164-2/+44
* | | | | | | | | | | 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 "Update getLayoutDirectionFromLocale() for using ICU"Fabrice Di Meglio2011-06-161-11/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update getLayoutDirectionFromLocale() for using ICUFabrice Di Meglio2011-06-161-11/+2
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | 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 "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-164-1/+47
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | DownloadManager flags for network policy.Jeff Sharkey2011-06-164-1/+47
* | | | | | | | | | | | Merge "Inline SeekBarPreference"John Reck2011-06-165-46/+317
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Inline SeekBarPreferenceJohn Reck2011-06-165-46/+317
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | am 241b65ac: am 5f350512: Merge "Reset connections AFTER we take down the net...Robert Greenwalt2011-06-161-41/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | / / | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | am 5f350512: Merge "Reset connections AFTER we take down the network." into h...Robert Greenwalt2011-06-161-41/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Reset connections AFTER we take down the network." into honeycomb-LTERobert Greenwalt2011-06-161-41/+0
| | |\ \ \ \ \ \ \ \ \