summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am ebadc461: am dd8df041: Merge "Setting config_use_sim_language_file to fals...Amit Mahajan2015-08-171-0/+21
|\
| * am dd8df041: Merge "Setting config_use_sim_language_file to false for 334-020...Amit Mahajan2015-08-171-0/+21
| |\
| | * Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-devAmit Mahajan2015-08-171-0/+21
| | |\
| | | * Setting config_use_sim_language_file to false for 334-020.Amit Mahajan2015-08-121-0/+21
* | | | am 581fd0fb: am 757e2c7f: Merge "Fix documentation issue" into mnc-devJorim Jaggi2015-08-171-3/+0
|\ \ \ \ | |/ / /
| * | | am 757e2c7f: Merge "Fix documentation issue" into mnc-devJorim Jaggi2015-08-171-3/+0
| |\ \ \ | | |/ /
| | * | Fix documentation issueJorim Jaggi2015-08-171-3/+0
* | | | Merge "Introduce permission for updating the cell broadcast content provider....Bryce Lee2015-08-171-0/+5
|\ \ \ \
| * | | | Introduce permission for updating the cell broadcast content provider.Bryce Lee2015-07-161-0/+5
* | | | | am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr...Ruben Brunk2015-08-176-0/+86
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Add experimental camera session prepare API." into mnc-dr-devRuben Brunk2015-08-176-0/+86
| |\ \ \ \
| | * | | | Add experimental camera session prepare API.Ruben Brunk2015-08-146-0/+86
* | | | | | am 877c2257: Merge "instrument fingerprint service" into mnc-dr-devChris Wren2015-08-171-0/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "instrument fingerprint service" into mnc-dr-devChris Wren2015-08-171-0/+15
| |\ \ \ \ \
| | * | | | | instrument fingerprint serviceChris Wren2015-08-141-0/+15
* | | | | | | am aed1c9fb: am 5d467ac5: Merge "Remove uids with empty history from NetworkS...Esteban Talavera2015-08-171-6/+20
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enum...Esteban Talavera2015-08-171-6/+20
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge "Remove uids with empty history from NetworkStats uid enumeration" into...Esteban Talavera2015-08-171-6/+20
| | |\ \ \ \ \
| | | * | | | | Remove uids with empty history from NetworkStats uid enumerationZoltan Szatmary-Ban2015-08-141-6/+20
* | | | | | | | am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCamer...Eino-Ville Talvala2015-08-163-2/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc...Eino-Ville Talvala2015-08-163-2/+11
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-devEino-Ville Talvala2015-08-153-2/+11
| | |\ \ \ \ \ \
| | | * | | | | | Camera2: Add camera type to getNumberOfCameras.Eino-Ville Talvala2015-08-143-2/+11
* | | | | | | | | am ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm]...Dianne Hackborn2015-08-163-11/+52
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {U...Dianne Hackborn2015-08-163-11/+52
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...Dianne Hackborn2015-08-143-11/+52
* | | | | | | | | am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-devDan Sandler2015-08-164-25/+122
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-devDan Sandler2015-08-154-25/+122
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge ""I tried to think of the most harmless thing."" into mnc-devDaniel Sandler2015-08-145-25/+124
| | |\ \ \ \ \ \ \
| | | * | | | | | | "I tried to think of the most harmless thing."Dan Sandler2015-08-145-25/+124
| | | | |/ / / / / | | | |/| | | | |
* | | | | | | | | Merge commit '8dcda391c79e8c2fd20a87834f1f61645aa771ea' into cw-e-devGeoff Mendal2015-08-151-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | resolved conflicts for merge of 8ad3e817 to mnc-dr-devDaniel Sandler2015-08-151-0/+2
* | | | | | | | | am 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to a...Adam Lesinski2015-08-141-6/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system U...Adam Lesinski2015-08-141-6/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc...Adam Lesinski2015-08-141-6/+6
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDsAdam Lesinski2015-08-131-6/+6
| | | | |/ / / / / | | | |/| | | | |
* | | | | | | | | am b47890c4: am 7e7d79ef: Merge "Make "Ask every time" actually work that way...Chris Tate2015-08-142-0/+17
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-devChris Tate2015-08-142-0/+17
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Make "Ask every time" actually work that way" into mnc-devChris Tate2015-08-142-0/+17
| | |\ \ \ \ \ \ \
| | | * | | | | | | Make "Ask every time" actually work that wayChristopher Tate2015-08-132-0/+17
* | | | | | | | | | am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permiss...Svetoslav Ganov2015-08-144-0/+118
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am b045331f: Merge "Add GTS test to ensure valid default permission grants - ...Svetoslav Ganov2015-08-144-0/+118
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | / / / / | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Merge "Add GTS test to ensure valid default permission grants - framework" in...Svetoslav Ganov2015-08-144-0/+118
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | Add GTS test to ensure valid default permission grants - frameworkSvet Ganov2015-08-124-0/+118
* | | | | | | | | am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state...Jeff Sharkey2015-08-141-0/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into ...Jeff Sharkey2015-08-141-0/+9
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | / / / | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Merge "Method to show DialogFragment allowing state loss." into mnc-devJeff Sharkey2015-08-141-0/+9
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Method to show DialogFragment allowing state loss.Jeff Sharkey2015-08-131-0/+9
* | | | | | | | Merge "Add a setting to enable cellular on boot." into cw-e-devWei Liu2015-08-131-0/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a setting to enable cellular on boot.Wei Liu2015-08-121-0/+7