summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev au...Jason Monk2015-01-223-3/+18
|\
| * Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev au...Jason Monk2015-01-223-3/+18
| |\
| | * Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-devJason Monk2015-01-223-3/+18
| | |\
| | | * Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-devJason Monk2015-01-223-3/+18
| | | |\
| | | | * Show connect dialog when selecting secure QS wifiJason Monk2015-01-213-3/+18
* | | | | Merge "Add support for persist.sys.locale." automerge: dca2332 automerge: 117...Narayan Kamath2015-01-223-24/+52
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add support for persist.sys.locale." automerge: dca2332Narayan Kamath2015-01-223-24/+52
| |\ \ \ \
| | * \ \ \ Merge "Add support for persist.sys.locale."Narayan Kamath2015-01-223-24/+52
| | |\ \ \ \
| | | * \ \ \ Merge "Add support for persist.sys.locale."Narayan Kamath2015-01-223-24/+52
| | | |\ \ \ \
| | | | * | | | Add support for persist.sys.locale.Narayan Kamath2015-01-223-24/+52
| | | |/ / / /
* | | | | | | Merge "Flush and sync before calling JournaledFile.commit"Kenny Guy2015-01-221-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Flush and sync before calling JournaledFile.commitKenny Guy2015-01-211-0/+2
* | | | | | | | Merge "[WebView] Improve documentation around full screen mode."Ignacio Solla2015-01-222-16/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | [WebView] Improve documentation around full screen mode.Ignacio Solla2015-01-222-16/+26
* | | | | | | | | am 3677117d: Merge "Never set "Work" or "Personal apps" as prefered activitie...Nicolas Prevot2015-01-221-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | am 3677117d: Merge "Never set "Work" or "Personal apps" as prefered activitie...Nicolas Prevot2015-01-221-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-...Nicolas Prevot2015-01-221-1/+1
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-...Nicolas Prevot2015-01-221-1/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | Never set "Work" or "Personal apps" as prefered activities.Nicolas Prevot2015-01-211-1/+1
* | | | | | | | | | Merge "Clear VPN config when VPN disconnects."Sander Alewijnse2015-01-221-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Clear VPN config when VPN disconnects.Paul Jensen2015-01-211-0/+1
* | | | | | | | | | | Merge "Log interface name and uid when filtering a blocked network." into lmp...Erik Kline2015-01-221-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge "Log interface name and uid when filtering a blocked network." into lmp...Erik Kline2015-01-221-1/+4
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Log interface name and uid when filtering a blocked network." into lmp...Erik Kline2015-01-221-1/+4
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge "Log interface name and uid when filtering a blocked network." into lmp...Erik Kline2015-01-221-1/+4
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Log interface name and uid when filtering a blocked network.Erik Kline2015-01-211-1/+4
| | | | | |/ / / / / / | | | | |/| | | | | |
* | | | | | | | | | | am 0ac8dfa3: Merge "Clarify getTrustAgentConfiguration() documentation." into...Jim Miller2015-01-221-4/+10
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 0ac8dfa3: Merge "Clarify getTrustAgentConfiguration() documentation." into...Jim Miller2015-01-221-4/+10
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-devJim Miller2015-01-221-4/+10
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-devJim Miller2015-01-221-4/+10
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Clarify getTrustAgentConfiguration() documentation.Jim Miller2015-01-211-4/+10
* | | | | | | | | | | | am c988e15e: Merge "CEC: Let playback device switch TV input after bootup" in...Jinsuk Kim2015-01-221-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am c988e15e: Merge "CEC: Let playback device switch TV input after bootup" in...Jinsuk Kim2015-01-221-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-devJinsuk Kim2015-01-221-0/+4
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-devJinsuk Kim2015-01-221-0/+4
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | CEC: Let playback device switch TV input after bootupJinsuk Kim2015-01-211-0/+4
| | | | |/ / / / / / / /
* | | | | | | | | | | | am 67add1d2: Merge "TIF: TvInputHardwareManager puts multiple sink ports into...Wonsik Kim2015-01-221-50/+66
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 67add1d2: Merge "TIF: TvInputHardwareManager puts multiple sink ports into...Wonsik Kim2015-01-221-50/+66
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch"...Wonsik Kim2015-01-221-50/+66
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch"...Wonsik Kim2015-01-221-50/+66
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | TIF: TvInputHardwareManager puts multiple sink ports into audio patchWonsik Kim2015-01-201-50/+66
| | | | | |/ / / / / / / | | | | |/| | | | | | |
* | | | | | | | | | | | Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the inpu...Miao Wang2015-01-222-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the inpu...Miao Wang2015-01-222-6/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the inpu...Miao Wang2015-01-222-6/+10
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the inpu...Miao Wang2015-01-222-6/+10
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | [Renderscript] Add check for Allocation.copyTo(Array) andMiao Wang2015-01-212-6/+10
* | | | | | | | | | | | | am d56352db: am c79a8ea0: Merge "Resume home activity can skip resume and cau...Craig Mautner2015-01-220-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am d56352db: am c79a8ea0: Merge "Resume home activity can skip resume and cau...Craig Mautner2015-01-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am c79a8ea0: Merge "Resume home activity can skip resume and cause ANR. DO NO...Craig Mautner2015-01-221-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into...Craig Mautner2015-01-221-5/+5
| | | |\ \ \ \ \ \ \ \ \ \