summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | am 10b829e1: am fec824b6: Merge "Adding Android Fundamentals video." into lmp...Eric Gilmore2015-01-121-4/+19
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | am fec824b6: Merge "Adding Android Fundamentals video." into lmp-docsEric Gilmore2015-01-121-4/+19
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | Merge "Adding Android Fundamentals video." into lmp-docsEric Gilmore2015-01-121-4/+19
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Adding Android Fundamentals video.Eric Gilmore2015-01-091-4/+19
* | | | | | | | | | | am 2c7e5631: am 7862ba29: am 6c8b80ac: Merge "Removing three obsolete lessons...Eric Gilmore2015-01-122-35/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 7862ba29: am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, wh...Eric Gilmore2015-01-122-35/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn r...Eric Gilmore2015-01-122-35/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge "Removing three obsolete lessons from TOC, which in turn removes them f...Eric Gilmore2015-01-092-35/+2
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Removing three obsolete lessons from TOC, which in turn removes themEric Gilmore2015-01-072-35/+2
| | | | |/ / / / / / /
* | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-01-1272-437/+221
* | | | | | | | | | | Merge "AudioService: send connection intent for HDMI ARC device" into lmp-mr1...Eric Laurent2015-01-121-2/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | AudioService: send connection intent for HDMI ARC deviceEric Laurent2015-01-091-2/+4
* | | | | | | | | | | | Merge "Avoid showing emergency calls when not possible" into lmp-mr1-devJason Monk2015-01-122-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Avoid showing emergency calls when not possibleJason Monk2015-01-082-1/+6
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Added configuration to determine whether VoLTE requires provisioning."...Etan Cohen2015-01-111-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Added configuration to determine whether VoLTE requires provisioning.Etan Cohen2015-01-101-0/+3
* | | | | | | | | | | | | Merge "CEC: Keep Playback device awake while it is the active source" into lm...Jinsuk Kim2015-01-104-23/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | CEC: Keep Playback device awake while it is the active sourceJinsuk Kim2015-01-094-23/+68
* | | | | | | | | | | | | | am aadcdef3: am 191d06b5: am 74147527: am 8505c387: Special case AppCompat to...Deepanshu Gupta2015-01-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am 191d06b5: am 74147527: am 8505c387: Special case AppCompat to show action ...Deepanshu Gupta2015-01-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am 74147527: am 8505c387: Special case AppCompat to show action bar. automerg...Deepanshu Gupta2015-01-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ am 74147527: am 8505c387: Special case AppCompat to show action bar.Deepanshu Gupta2015-01-101-13/+23
| | | |\ \ \ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ \ \ am 686160b8: am 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: d...Deepanshu Gupta2015-01-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 autome...Deepanshu Gupta2015-01-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Support Locale.toLanguageTag on Java 6 automerge: dbd64f7Deepanshu Gupta2015-01-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Support Locale.toLanguageTag on Java 6Deepanshu Gupta2015-01-104-13/+129
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ am 7aafa4fd: am 38884a30: LayoutLib: Fix System.arraycopy() automerge: 51fb77...Deepanshu Gupta2015-01-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | / / / / / / / / / / | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 38884a30: LayoutLib: Fix System.arraycopy() automerge: 51fb775 automerge: ...Deepanshu Gupta2015-01-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | LayoutLib: Fix System.arraycopy() automerge: 51fb775Deepanshu Gupta2015-01-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | LayoutLib: Fix System.arraycopy()Deepanshu Gupta2015-01-103-8/+23
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case...Deepanshu Gupta2015-01-101-13/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to...Deepanshu Gupta2015-01-101-13/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action ...Deepanshu Gupta2015-01-101-13/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | am 74147527: am 8505c387: Special case AppCompat to show action bar.Deepanshu Gupta2015-01-101-13/+23
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | am 8505c387: Special case AppCompat to show action bar.Deepanshu Gupta2015-01-101-13/+23
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | Special case AppCompat to show action bar.Deepanshu Gupta2015-01-101-13/+23
* | | | | | | | | | | | | | | | | | am 20625cce: am c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag...Deepanshu Gupta2015-01-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6Deepanshu Gupta2015-01-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6Deepanshu Gupta2015-01-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | Support Locale.toLanguageTag on Java 6Deepanshu Gupta2015-01-094-13/+129
| | | | |_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | am b3d418ad: am db703ab6: am 51fb7754: (-s ours) LayoutLib: Fix System.arrayc...Deepanshu Gupta2015-01-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am db703ab6: am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy()Deepanshu Gupta2015-01-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy()Deepanshu Gupta2015-01-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | LayoutLib: Fix System.arraycopy()Deepanshu Gupta2015-01-093-8/+23
* | | | | | | | | | | | | | | | | Merge "Remember to cancel lingering when a network again satsifies a NetworkR...Paul Jensen2015-01-101-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Remember to cancel lingering when a network again satsifies a NetworkRequest.Paul Jensen2015-01-081-0/+4
* | | | | | | | | | | | | | | | | | Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-devRachad2015-01-101-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | MediaCodec: Added E-AC3 mime type (@hide).Rachad2014-12-231-0/+4
* | | | | | | | | | | | | | | | | | | Merge "Camera2: Fix early EOF in DngCreator#writeByteBuffer." into lmp-mr1-devRuben Brunk2015-01-091-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Camera2: Fix early EOF in DngCreator#writeByteBuffer.Ruben Brunk2015-01-091-4/+10