summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* DO NOT MERGE: Eliminate StackBox.Craig Mautner2013-12-093-129/+37
* DO NOT MERGE : Move some system services to their own sub package.Amith Yamasani2013-12-092-1/+11
* DO NOT MERGE: Remove obsolete "headless" supportMike Lockwood2013-12-091-11/+0
* am 2daa0c93: Merge "Add address flags and scope to LinkAddress."Lorenzo Colitti2013-12-096-52/+360
|\
| * Merge "Add address flags and scope to LinkAddress."Lorenzo Colitti2013-12-076-52/+360
| |\
| | * Add address flags and scope to LinkAddress.Lorenzo Colitti2013-12-066-52/+360
| * | Merge commit 'bac61807d3bcfff957b358cb9ad77850bd373689' into HEADThe Android Open Source Project2013-12-05251-2657/+5251
| |\ \ | | |/ | |/|
* | | am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library"Ying Wang2013-12-051-1/+0
|\ \ \ | |/ /
| * | wifi: Remove obsolete libwpa_client libraryDmitry Shmidt2013-12-051-1/+0
* | | am 8026b2ce: Merge "Use exceptionCheck after VMRuntime.newNonMovableArray/add...Brian Carlstrom2013-12-051-9/+13
|\ \ \ | |/ /
| * | Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf.Mathieu Chartier2013-12-041-9/+13
* | | am 453a5233: Merge "Minor changes to LinkAddress."Lorenzo Colitti2013-12-032-24/+242
|\ \ \ | |/ /
| * | Minor changes to LinkAddress.Lorenzo Colitti2013-12-032-24/+242
* | | am 738fa2f6: Merge "Add dalvik.vm.gctype to enable switching between differen...Mathieu Chartier2013-12-021-0/+8
|\ \ \ | |/ /
| * | Add dalvik.vm.gctype to enable switching between different GCs.Mathieu Chartier2013-12-021-0/+8
* | | am f226bc60: Merge "Use LinkAddress in address notifications."Lorenzo Colitti2013-11-262-4/+7
|\ \ \ | |/ /
| * | Use LinkAddress in address notifications.Lorenzo Colitti2013-11-262-4/+7
* | | am 484b57a5: am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docsKatie McCormick2013-11-263-5/+5
|\ \ \
| * \ \ am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docsKatie McCormick2013-11-263-5/+5
| |\ \ \
| | * | | Doc updates: Javadoc fixesKatie McCormick2013-11-263-5/+5
* | | | | am 9d4ac970: Merge "Pass DNS server info notifications to observers."Lorenzo Colitti2013-11-262-0/+14
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Pass DNS server info notifications to observers.Lorenzo Colitti2013-11-252-0/+14
| * | | | Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEADThe Android Open Source Project2013-11-222380-50334/+99629
| |\ \ \ \
* | \ \ \ \ am e18b673a: am 330dfa7d: Merge "Fix @see link in DocumentsContract docs." in...John Spurlock2013-11-251-2/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am 330dfa7d: Merge "Fix @see link in DocumentsContract docs." into klp-docsJohn Spurlock2013-11-251-2/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "Fix @see link in DocumentsContract docs." into klp-docsJohn Spurlock2013-11-251-2/+0
| | |\ \ \ \
| | | * | | | Fix @see link in DocumentsContract docs.John Spurlock2013-11-251-2/+0
* | | | | | | am 56979b22: am 125d133b: Fix bad @see links in Intent.java.John Spurlock2013-11-251-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 125d133b: Fix bad @see links in Intent.java.John Spurlock2013-11-251-3/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix bad @see links in Intent.java.John Spurlock2013-11-251-3/+3
| | |/ / / /
* | | | | | am 263c4310: am ce468a35: Stop wifi display discovery when no longer needed.Jeff Brown2013-11-213-18/+59
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am ce468a35: Stop wifi display discovery when no longer needed.Jeff Brown2013-11-213-18/+59
| |\ \ \ \ \
| | * | | | | Stop wifi display discovery when no longer needed.Jeff Brown2013-11-213-18/+59
* | | | | | | am ecfae4f8: am a4c8fabf: Merge "fix ethernet and wifi can\'t be tuned sepera...Robert Greenwalt2013-11-211-1/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am a4c8fabf: Merge "fix ethernet and wifi can\'t be tuned seperately issue"Robert Greenwalt2013-11-211-1/+1
| |\ \ \ \ \ \
| | * | | | | | fix ethernet and wifi can't be tuned seperately issueJianzheng Zhou2013-11-151-1/+1
* | | | | | | | am 27bd4440: am 28029658: Fix javadoc typo in SparseArray.Newton Allen2013-11-216-6/+6
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | am 28029658: Fix javadoc typo in SparseArray.Newton Allen2013-11-216-6/+6
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Fix javadoc typo in SparseArray.Newton Allen2013-11-216-6/+6
* | | | | | | | am b95d6f54: am c6db9c3b: Merge "Revert "PreferenceFragment showing the bread...Svetoslav Ganov2013-11-211-5/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am c6db9c3b: Merge "Revert "PreferenceFragment showing the breadcrumb when no...Svetoslav Ganov2013-11-211-5/+6
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" i...Svetoslav Ganov2013-11-211-5/+6
| | |\ \ \ \ \ \
| | | * | | | | | Revert "PreferenceFragment showing the breadcrumb when not needed."Svetoslav Ganov2013-11-211-5/+6
* | | | | | | | | am 4ed5f502: am 4d159661: Merge "Revert "PreferencesFragment showing the brea...Svetoslav Ganov2013-11-211-6/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 4d159661: Merge "Revert "PreferencesFragment showing the breadcrumb area i...Svetoslav Ganov2013-11-211-6/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Revert "PreferencesFragment showing the breadcrumb area in single pane...Svetoslav Ganov2013-11-211-6/+6
| | |\ \ \ \ \ \ \
| | | * | | | | | | Revert "PreferencesFragment showing the breadcrumb area in single pane mode."Svetoslav Ganov2013-11-211-6/+6
| | * | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2013-11-211-1/+1
* | | | | | | | | | am a40420c9: am 43eea0a6: Merge "Doc change: Change description for BRAND. Bu...Dirk Dougherty2013-11-211-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 43eea0a6: Merge "Doc change: Change description for BRAND. Bug:11431921" i...Dirk Dougherty2013-11-211-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |