summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* am d82b1c3b: am 9d8721f8: Merge "Remove dead code."Elliott Hughes2013-09-241-198/+0
|\
| * am 9d8721f8: Merge "Remove dead code."Elliott Hughes2013-09-241-198/+0
| |\
| | * Remove dead code.Elliott Hughes2013-09-241-198/+0
* | | am 7ef9b612: Merge "Fix monkey bugs in ListView" into klp-devAdam Powell2013-09-243-13/+6
|\ \ \
| * \ \ Merge "Fix monkey bugs in ListView" into klp-devAdam Powell2013-09-243-13/+6
| |\ \ \
| | * | | Fix monkey bugs in ListViewAdam Powell2013-09-243-13/+6
* | | | | am 5f86b90b: Merge "Fix issue #10848916: "Always" button is not working." int...Dianne Hackborn2013-09-245-48/+200
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix issue #10848916: "Always" button is not working." into klp-devDianne Hackborn2013-09-245-48/+200
| |\ \ \ \
| | * | | | Fix issue #10848916: "Always" button is not working.Dianne Hackborn2013-09-245-48/+200
* | | | | | am 6bc7cacf: Merge "Fix NPE in PopupMenu.getDragToOpenListener()" into klp-devAlan Viverette2013-09-241-0/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix NPE in PopupMenu.getDragToOpenListener()" into klp-devAlan Viverette2013-09-241-0/+13
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix NPE in PopupMenu.getDragToOpenListener()Alan Viverette2013-09-241-0/+13
* | | | | | am cfdc0369: Merge "Disable ActionBar usage of transitions" into klp-devChet Haase2013-09-245-26/+85
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Disable ActionBar usage of transitions" into klp-devChet Haase2013-09-245-26/+85
| |\ \ \ \ \
| | * | | | | Disable ActionBar usage of transitionsChet Haase2013-09-235-26/+85
* | | | | | | am 0d38d0b4: Merge "Multiple printer discovery session instances and other bu...Svetoslav2013-09-241-0/+40
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Multiple printer discovery session instances and other bugs." into klp...Svetoslav2013-09-241-0/+40
| |\ \ \ \ \ \
| | * | | | | | Multiple printer discovery session instances and other bugs.Svetoslav2013-09-231-0/+40
* | | | | | | | am e1cb9acc: Merge "Update AdapterView.performItemClick() documentation" into...Alan Viverette2013-09-241-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Update AdapterView.performItemClick() documentation" into klp-devAlan Viverette2013-09-241-1/+3
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Update AdapterView.performItemClick() documentationAlan Viverette2013-09-171-1/+3
* | | | | | | | am 4e31b804: Merge "Update WebView documentation section about zoom." into kl...Martin Kosiba2013-09-241-4/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Update WebView documentation section about zoom." into klp-devMartin Kosiba2013-09-241-4/+11
| |\ \ \ \ \ \ \
| | * | | | | | | Update WebView documentation section about zoom.Martin Kosiba2013-09-201-4/+11
* | | | | | | | | am 0d9fdc24: Merge "Camera2: replace EDQUOT with EUSERS" into klp-devZhijun He2013-09-231-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Camera2: replace EDQUOT with EUSERS" into klp-devZhijun He2013-09-241-2/+2
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Camera2: replace EDQUOT with EUSERSZhijun He2013-09-231-2/+2
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | am fe538cb6: Merge "Fix broken method WorkSource.set (names aren\'t applied)....David Christie2013-09-231-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix broken method WorkSource.set (names aren't applied).David Christie2013-09-231-1/+0
* | | | | | | | am 0156a379: Merge "Allow saving to Downloads." into klp-devJeff Sharkey2013-09-232-1/+21
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Allow saving to Downloads." into klp-devJeff Sharkey2013-09-232-1/+21
| |\ \ \ \ \ \ \
| | * | | | | | | Allow saving to Downloads.Jeff Sharkey2013-09-232-1/+21
| | |/ / / / / /
* | | | | | | | am 85f77c2b: Merge "Unmarshall PFDs properly when hand-crafting interface stu...Amith Yamasani2013-09-233-10/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Unmarshall PFDs properly when hand-crafting interface stubs" into klp-devAmith Yamasani2013-09-233-10/+11
| |\ \ \ \ \ \ \
| | * | | | | | | Unmarshall PFDs properly when hand-crafting interface stubsAmith Yamasani2013-09-233-10/+11
| | | |/ / / / / | | |/| | | | |
* | | | | | | | am a3abca90: Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-devDianne Hackborn2013-09-231-31/+275
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-devDianne Hackborn2013-09-231-31/+275
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Issue #10461551: KLP API Review: AppOpsManagerDianne Hackborn2013-09-231-31/+275
* | | | | | | | am 5e1a5e5b: Merge "Create unique files, root ordering, UI bugs." into klp-devJeff Sharkey2013-09-221-0/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Create unique files, root ordering, UI bugs." into klp-devJeff Sharkey2013-09-221-0/+13
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Create unique files, root ordering, UI bugs.Jeff Sharkey2013-09-211-0/+13
| | |/ / / / /
* | | | | | | am 3ba21e97: Merge "camera2: Rename CameraProperties to CameraCharacteristics...Igor Murashkin2013-09-228-36/+43
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | camera2: Rename CameraProperties to CameraCharacteristicsIgor Murashkin2013-09-218-36/+43
* | | | | | | am ca833c38: Merge "camera2: Add capture sequences and capture failures" into...Igor Murashkin2013-09-215-28/+319
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "camera2: Add capture sequences and capture failures" into klp-devIgor Murashkin2013-09-225-28/+319
| |\ \ \ \ \ \
| | * | | | | | camera2: Add capture sequences and capture failuresIgor Murashkin2013-09-205-28/+319
* | | | | | | | am 56065891: Merge commit \'53221120\' into fix-merge-conflictWink Saville2013-09-211-2/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge commit '53221120' into fix-merge-conflictWink Saville2013-09-211-2/+7
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ am ab8cabf1: am 1e4f4618: Do not always call setIsConnectedToProvisioningNetw...Wink Saville2013-09-211-2/+4
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ am 1e4f4618: Do not always call setIsConnectedToProvisioningNetwork(false)Wink Saville2013-09-211-2/+4
| | | |\ \ \ \ \ \ \