summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Support activities in the same process having different resources.Wale Ogunwale2015-01-277-34/+130
* am ad664808: am 6d16b861: Merge "Avoid NullPointerException if createUser ret...Benjamin Franz2015-01-261-0/+3
|\
| * am 6d16b861: Merge "Avoid NullPointerException if createUser returns null" in...Benjamin Franz2015-01-261-0/+3
| |\
| | * am 6d16b861: Merge "Avoid NullPointerException if createUser returns null" in...Benjamin Franz2015-01-261-0/+3
| | |\
| | | * Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-devBenjamin Franz2015-01-261-0/+3
| | | |\
| | | | * Avoid NullPointerException if createUser returns nullBenjamin Franz2015-01-231-0/+3
* | | | | am 20bd0c23: am 059b8ab6: am 414ea81e: Merge "Ensure notifications are sent w...Zoltan Szatmary-Ban2015-01-261-0/+13
|\ \ \ \ \ | |/ / / /
| * | | | am 059b8ab6: am 414ea81e: Merge "Ensure notifications are sent when locking/u...Zoltan Szatmary-Ban2015-01-261-0/+13
| |\ \ \ \ | | |/ / /
| | * | | am 414ea81e: Merge "Ensure notifications are sent when locking/unlocking loca...Zoltan Szatmary-Ban2015-01-261-0/+13
| | |\ \ \ | | | |/ /
| | | * | Merge "Ensure notifications are sent when locking/unlocking location share" i...Zoltan Szatmary-Ban2015-01-261-0/+13
| | | |\ \
| | | | * | Ensure notifications are sent when locking/unlocking location shareZoltan Szatmary-Ban2015-01-231-0/+13
* | | | | | Accessibility: Sometimes cannot interact with nav bar items. automerge: 10a05...Svetoslav2015-01-231-6/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Accessibility: Sometimes cannot interact with nav bar items. automerge: 10a053eSvetoslav2015-01-231-6/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Accessibility: Sometimes cannot interact with nav bar items.Svetoslav2015-01-231-6/+3
| | |\ \ \ \ | | | |/ / /
| | | * | | Accessibility: Sometimes cannot interact with nav bar items.Svetoslav2015-01-231-6/+3
* | | | | | am 56c119ab: Merge "CEC: Handles initiation of press-and-hold correctly" into...Jinsuk Kim2015-01-231-12/+34
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 56c119ab: Merge "CEC: Handles initiation of press-and-hold correctly" into...Jinsuk Kim2015-01-231-12/+34
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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 bfca5f40: am 266303fd: Merge "Avoid SecurityException when calling getUser...Benjamin Franz2015-01-231-21/+42
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am bfca5f40: am 266303fd: Merge "Avoid SecurityException when calling getUser...Benjamin Franz2015-01-231-21/+42
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 266303fd: Merge "Avoid SecurityException when calling getUserData" into lm...Benjamin Franz2015-01-231-21/+42
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-devBenjamin Franz2015-01-231-21/+42
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Avoid SecurityException when calling getUserDataBenjamin Franz2015-01-221-21/+42
* | | | | | am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1...Jinsuk Kim2015-01-232-12/+21
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1...Jinsuk Kim2015-01-232-12/+21
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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
| | | | | |/ | | | | |/|
* | | | | | Merge "Even more debug for bug 17721767." into lmp-mr1-dev automerge: dbabf37...Craig Mautner2015-01-223-1/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Even more debug for bug 17721767." into lmp-mr1-dev automerge: dbabf37Craig Mautner2015-01-223-1/+13
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Even more debug for bug 17721767." into lmp-mr1-devCraig Mautner2015-01-223-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
* | | | | | | Merge "Add support for persist.sys.locale." automerge: dca2332 automerge: 117...Narayan Kamath2015-01-222-4/+20
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Add support for persist.sys.locale." automerge: dca2332Narayan Kamath2015-01-222-4/+20
| |\ \ \ \ \ \
| | * | | | | | Add support for persist.sys.locale.Narayan Kamath2015-01-222-4/+20
* | | | | | | | 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 "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 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
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /