summaryrefslogtreecommitdiffstats
path: root/services/core/java
Commit message (Expand)AuthorAgeFilesLines
* am 9c5ccc36: Merge "CEC: Discard key event to itself" into lmp-mr1-devJinsuk Kim2015-01-291-1/+5
|\
| * Merge "CEC: Discard key event to itself" into lmp-mr1-devJinsuk Kim2015-01-291-1/+5
| |\
| | * CEC: Discard key event to itselfJinsuk Kim2015-01-301-1/+5
* | | am 3f923474: Merge "CEC: Add CEC device upon receiving <Report Physical Addre...Jinsuk Kim2015-01-292-1/+13
|\ \ \ | |/ /
| * | Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp...Jinsuk Kim2015-01-292-1/+13
| |\ \
| | * | CEC: Add CEC device upon receiving <Report Physical Address>Jinsuk Kim2015-01-292-1/+13
| | |/
* | | am 07600116: CEC: Ensure stable AVR connectionJinsuk Kim2015-01-291-0/+19
|\ \ \ | |/ /
| * | CEC: Ensure stable AVR connectionJinsuk Kim2015-01-291-0/+19
* | | am 2ee0d6f4: CEC: Stop ARC if hotplug event is asserted lowJinsuk Kim2015-01-291-0/+13
|\ \ \ | |/ /
| * | CEC: Stop ARC if hotplug event is asserted lowJinsuk Kim2015-01-291-0/+13
* | | am 7640d989: CEC: Fix a regression bugJinsuk Kim2015-01-292-1/+20
|\ \ \ | |/ /
| * | CEC: Fix a regression bugJinsuk Kim2015-01-292-1/+20
* | | am 43b2746b: Merge "CEC: Let <Active Source> from the active source work" int...Jinsuk Kim2015-01-291-5/+0
|\ \ \ | |/ /
| * | CEC: Let <Active Source> from the active source workJinsuk Kim2015-01-281-5/+0
| |/
* | am f37b20e1: Merge "Fix \'always\' preferred app assignment" into lmp-mr1-devChristopher Tate2015-01-282-3/+3
|\ \ | |/
| * Merge "Fix 'always' preferred app assignment" into lmp-mr1-devChristopher Tate2015-01-282-3/+3
| |\
| | * Fix 'always' preferred app assignmentChristopher Tate2015-01-272-3/+3
* | | am 597bb696: Merge "Add a config for whether to start in touch mode." into lm...Tim Kilbourn2015-01-271-1/+3
|\ \ \ | |/ /
| * | Add a config for whether to start in touch mode.Tim Kilbourn2015-01-271-1/+3
| |/
* | am 5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-devCraig Mautner2015-01-271-10/+10
|\ \ | |/
| * Merge "Defer tap outside stack until multiwindows" into lmp-mr1-devCraig Mautner2015-01-271-10/+10
| |\
| | * Defer tap outside stack until multiwindowsCraig Mautner2015-01-271-10/+10
* | | am 525588c5: Merge "Make NetworkMonitor less aggressive on broken networks." ...Lorenzo Colitti2015-01-271-13/+30
|\ \ \ | |/ /
| * | Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-devLorenzo Colitti2015-01-271-13/+30
| |\ \
| | * | Make NetworkMonitor less aggressive on broken networks.Lorenzo Colitti2015-01-261-13/+30
* | | | am 49880eeb: Merge "Stop logging service starts and stops." into lmp-mr1-devCraig Mautner2015-01-271-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Stop logging service starts and stops." into lmp-mr1-devCraig Mautner2015-01-271-1/+1
| |\ \ \
| | * | | Stop logging service starts and stops.Craig Mautner2015-01-261-1/+1
* | | | | am cd8a80c7: Merge "TIF: fix loud volume after input switch when volume is 0"...Wonsik Kim2015-01-271-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | TIF: fix loud volume after input switch when volume is 0Wonsik Kim2015-01-271-1/+3
| |/ / /
* | | | am 09dff843: Merge "Only try to fetch time from NTP if there is a network con...Lorenzo Colitti2015-01-261-14/+4
|\ \ \ \ | |/ / /
| * | | Merge "Only try to fetch time from NTP if there is a network connection." int...Lorenzo Colitti2015-01-261-14/+4
| |\ \ \ | | |/ /
| | * | Only try to fetch time from NTP if there is a network connection.Lorenzo Colitti2015-01-261-14/+4
* | | | resolved conflicts for merge of 8995e140 to lmp-mr1-wfc-devCraig Mautner2015-01-265-93/+85
|\ \ \ \ | |/ / /
| * | | Merge "Add reason string for bringing stack to front" into lmp-mr1-devCraig Mautner2015-01-265-93/+85
| |\ \ \ | | |/ / | |/| / | | |/
| | * Add reason string for bringing stack to frontCraig Mautner2015-01-265-93/+85
* | | am 56c119ab: Merge "CEC: Handles initiation of press-and-hold correctly" into...Jinsuk Kim2015-01-231-12/+34
|\ \ \ | |/ /
| * | Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-devJinsuk Kim2015-01-231-12/+34
| |\ \
| | * | CEC: Handles initiation of press-and-hold correctlyJinsuk Kim2015-01-231-12/+34
* | | | am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1...Jinsuk Kim2015-01-232-12/+21
|\ \ \ \ | |/ / /
| * | | Merge "CEC: Add logic to return to internal source" into lmp-mr1-devJinsuk Kim2015-01-232-12/+21
| |\ \ \ | | |_|/ | |/| |
| | * | CEC: Add logic to return to internal sourceJinsuk Kim2015-01-222-12/+21
| | |/
* | | am dbabf37f: Merge "Even more debug for bug 17721767." into lmp-mr1-devCraig Mautner2015-01-233-1/+13
|\ \ \ | |/ /
| * | Merge "Even more debug for bug 17721767." into lmp-mr1-devCraig Mautner2015-01-223-1/+13
| |\ \
| | * | Even more debug for bug 17721767.Craig Mautner2015-01-223-1/+13
* | | | am 147cf4b8: Merge "Log interface name and uid when filtering a blocked netwo...Erik Kline2015-01-231-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 7de1ed9d: Merge "CEC: Let playback device switch TV input after bootup" in...Jinsuk Kim2015-01-231-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-devJinsuk Kim2015-01-221-0/+4
| |\ \ \ \