summaryrefslogtreecommitdiffstats
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add backup_id column to raw_contacts, and hash_id column to data"Zheng Fu2015-01-301-0/+17
|\
| * Add backup_id column to raw_contacts, and hash_id column to dataZheng Fu2015-01-121-0/+17
* | Merge "Removed userHandle from setXXX methods"Fyodor Kupolov2015-01-302-41/+40
|\ \
| * | Removed userHandle from setXXX methodsFyodor Kupolov2015-01-292-41/+40
* | | Merge "Move mute/unmute handling to adjust volume paths"RoboErik2015-01-301-2/+10
|\ \ \
| * | | Move mute/unmute handling to adjust volume pathsRoboErik2015-01-291-2/+10
* | | | Merge "Add accessors for switch thumb and track tinting"Alan Viverette2015-01-301-0/+172
|\ \ \ \
| * | | | Add accessors for switch thumb and track tintingAlan Viverette2015-01-301-0/+172
* | | | | Merge "Adding some debug controls to test multi-window."Winson Chung2015-01-303-0/+23
|\ \ \ \ \
| * | | | | Adding some debug controls to test multi-window.Winson Chung2015-01-293-0/+23
* | | | | | Merge "MidiManager: minor Javadoc tweaks"Mike Lockwood2015-01-309-9/+24
|\ \ \ \ \ \
| * | | | | | MidiManager: minor Javadoc tweaksMike Lockwood2015-01-309-9/+24
| | |/ / / / | |/| | | |
* | | | | | Merge "MidiManager: fix output port close"Mike Lockwood2015-01-301-1/+2
|\ \ \ \ \ \
| * | | | | | MidiManager: fix output port closePhil Burk2015-01-161-1/+2
* | | | | | | Merge "Add transition support to PopupWindow"Alan Viverette2015-01-304-161/+386
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add transition support to PopupWindowAlan Viverette2015-01-294-161/+386
* | | | | | | Merge "Also include the domain when parceling StaticIpConfiguration." automer...Lorenzo Colitti2015-01-301-0/+2
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge "Also include the domain when parceling StaticIpConfiguration." automer...Lorenzo Colitti2015-01-301-0/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Also include the domain when parceling StaticIpConfiguration.Lorenzo Colitti2015-01-291-0/+2
| | * | | | | | | Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()Paul Jensen2015-01-292-2/+3
| | * | | | | | | Support connecting to networks with misconfigured subnet masks.Lorenzo Colitti2015-01-281-4/+11
* | | | | | | | | Merge "Camera2: metadata spec update for reprocessing"Zhijun He2015-01-294-40/+233
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Camera2: metadata spec update for reprocessingZhijun He2015-01-294-40/+233
* | | | | | | | | | Merge "+ Add CarExtender to Notification Bug: 18316420"Zhen Yu Song2015-01-291-0/+397
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | + Add CarExtender to NotificationZhen Yu Song2015-01-291-0/+397
* | | | | | | | | | am eb2c4a07: am dbdaea0c: Merge "CEC: Do null/empty check against the paramet...Jinsuk Kim2015-01-291-0/+2
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | am eb2c4a07: am dbdaea0c: Merge "CEC: Do null/empty check against the paramet...Jinsuk Kim2015-01-291-0/+2
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkR...Jinsuk Kim2015-01-291-0/+2
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge "CEC: Do null/empty check against the parameter for checkRecordSource()...Jinsuk Kim2015-01-291-0/+2
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | CEC: Do null/empty check against the parameter for checkRecordSource()Jinsuk Kim2015-01-291-0/+2
* | | | | | | | | | | | | am 2ed9a7e5: am af461e12: Merge "Refine resolution order for typeface and fon...Raph Levien2015-01-291-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 2ed9a7e5: am af461e12: Merge "Refine resolution order for typeface and fon...Raph Levien2015-01-291-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am af461e12: Merge "Refine resolution order for typeface and fontFamily" into...Raph Levien2015-01-291-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-devRaph Levien2015-01-291-0/+5
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Refine resolution order for typeface and fontFamilyRaph Levien2015-01-291-0/+5
* | | | | | | | | | | | | | MidiManager: Add USB peripheral MIDI supportMike Lockwood2015-01-291-0/+10
* | | | | | | | | | | | | | Merge "Clear accessibility focus when the window loses visibility"Alan Viverette2015-01-291-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Clear accessibility focus when the window loses visibilityAlan Viverette2015-01-281-0/+5
* | | | | | | | | | | | | | | Merge "MIDI Manager: Remove message packetization from MIDI transport"Mike Lockwood2015-01-295-98/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | MIDI Manager: Remove message packetization from MIDI transportMike Lockwood2015-01-295-98/+46
* | | | | | | | | | | | | | | | Merge "AccessibilityNodeInfo refresh returns a stale state."Svetoslav2015-01-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | AccessibilityNodeInfo refresh returns a stale state.Svetoslav2015-01-281-1/+1
* | | | | | | | | | | | | | | | | am 06b1014c: Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-...Eino-Ville Talvala2015-01-282-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 06b1014c: Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-...Eino-Ville Talvala2015-01-282-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-devEino-Ville Talvala2015-01-282-7/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-devEino-Ville Talvala2015-01-282-7/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Camera2 legacy: Do not advertise NV21 support.Eino-Ville Talvala2015-01-282-7/+7
* | | | | | | | | | | | | | | | | Introduce new MNC API version.Dianne Hackborn2015-01-281-0/+5
* | | | | | | | | | | | | | | | | Merge "Added primaryUserOnly attribute for activities"Fyodor Kupolov2015-01-281-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Added primaryUserOnly attribute for activitiesFyodor Kupolov2015-01-271-5/+6
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |