Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Add logic to handle changes to file_contexts during update." | Geremy Condra | 2013-04-15 | 2 | -11/+110 |
|\ | |||||
| * | Add logic to handle changes to file_contexts during update. | Geremy Condra | 2013-04-15 | 2 | -11/+110 |
* | | Merge "Support persistable Uri permission grants." | Jeff Sharkey | 2013-04-15 | 3 | -153/+492 |
|\ \ | |||||
| * | | Support persistable Uri permission grants. | Jeff Sharkey | 2013-04-15 | 3 | -153/+492 |
* | | | Merge "Revert "Add logic to handle changes to file_contexts during update."" | Geremy Condra | 2013-04-15 | 2 | -80/+11 |
|\ \ \ | |/ / |/| | | |||||
| * | | Revert "Add logic to handle changes to file_contexts during update." | Geremy Condra | 2013-04-15 | 2 | -80/+11 |
* | | | resolved conflicts for merge of dd03b6dc to master | Svetoslav | 2013-04-12 | 1 | -3/+28 |
|\ \ \ | |||||
| * \ \ | am 26257a09: Merge "Allow for setting test type as a monkey." into jb-mr2-dev | Svetoslav Ganov | 2013-04-12 | 1 | -3/+28 |
| |\ \ \ | |||||
| | * \ \ | Merge "Allow for setting test type as a monkey." into jb-mr2-dev | Svetoslav Ganov | 2013-04-13 | 1 | -3/+28 |
| | |\ \ \ | |||||
| | | * | | | Allow for setting test type as a monkey. | Adam Momtaz | 2013-04-12 | 1 | -3/+28 |
* | | | | | | Merge "Implement separate stacks." | Craig Mautner | 2013-04-13 | 11 | -472/+628 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Implement separate stacks. | Craig Mautner | 2013-04-12 | 11 | -472/+628 |
* | | | | | | | Merge "Add logic to handle changes to file_contexts during update." | Geremy Condra | 2013-04-12 | 2 | -11/+80 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Add logic to handle changes to file_contexts during update. | Geremy Condra | 2013-04-12 | 2 | -11/+80 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge "Prepare WindowManager for multiple stacks." | Craig Mautner | 2013-04-12 | 5 | -27/+79 |
|\ \ \ \ \ | |||||
| * | | | | | Prepare WindowManager for multiple stacks. | Craig Mautner | 2013-04-06 | 5 | -27/+79 |
* | | | | | | Merge "Separate stacks into Home and others." | Craig Mautner | 2013-04-12 | 3 | -28/+25 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Separate stacks into Home and others. | Craig Mautner | 2013-04-06 | 3 | -28/+25 |
* | | | | | | am 9b8abb5a: am ce70311b: Merge "Add user restrictions (credentials, user rem... | Emily Bernier | 2013-04-12 | 1 | -0/+4 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | am ce70311b: Merge "Add user restrictions (credentials, user removal)" into j... | Emily Bernier | 2013-04-12 | 1 | -0/+4 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev | Emily Bernier | 2013-04-12 | 1 | -0/+4 |
| | |\ \ \ \ | |||||
| | | * | | | | Add user restrictions (credentials, user removal) | Emily Bernier | 2013-04-11 | 1 | -0/+4 |
* | | | | | | | am 2d28d622: am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-dev | Robert Greenwalt | 2013-04-12 | 2 | -3/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-dev | Robert Greenwalt | 2013-04-12 | 2 | -3/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge "Add new route.hasGateway() api" into jb-mr2-dev | Robert Greenwalt | 2013-04-12 | 2 | -3/+2 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Add new route.hasGateway() api | Robert Greenwalt | 2013-04-12 | 2 | -3/+2 |
* | | | | | | | | am 12cff6f6: am 10a25c0a: Merge "Remove keystore entries when app data cleare... | Kenny Root | 2013-04-12 | 1 | -23/+45 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am 10a25c0a: Merge "Remove keystore entries when app data cleared" into jb-mr... | Kenny Root | 2013-04-12 | 1 | -23/+45 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Remove keystore entries when app data cleared | Kenny Root | 2013-04-12 | 1 | -23/+45 |
* | | | | | | | | am 9d02928e: am 14c8c741: Merge "Adding APIs for an accessibility service to ... | Svetoslav | 2013-04-11 | 3 | -45/+324 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am 14c8c741: Merge "Adding APIs for an accessibility service to intercept key... | Svetoslav | 2013-04-11 | 3 | -45/+324 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge "Adding APIs for an accessibility service to intercept key events." int... | Svetoslav | 2013-04-12 | 3 | -45/+324 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Adding APIs for an accessibility service to intercept key events. | Svetoslav | 2013-04-11 | 3 | -45/+324 |
* | | | | | | | | | am 64ef8ed8: am 68913baf: Merge "Remove /data/system location for mac_permiss... | Geremy Condra | 2013-04-11 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am 68913baf: Merge "Remove /data/system location for mac_permissions.xml." | Geremy Condra | 2013-04-11 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Remove /data/system location for mac_permissions.xml. | Stephen Smalley | 2013-04-05 | 1 | -1/+0 |
* | | | | | | | | | | am 26c702c3: am ba880da4: Merge "Fix issue #7643046: Activity.getCallingPacka... | Dianne Hackborn | 2013-04-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am ba880da4: Merge "Fix issue #7643046: Activity.getCallingPackage() bogusly ... | Dianne Hackborn | 2013-04-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Fix issue #7643046: Activity.getCallingPackage() bogusly returns null... | Dianne Hackborn | 2013-04-11 | 1 | -1/+1 |
| | | |_|/ / / / / | | |/| | | | | | | |||||
* | | | | | | | | | am 5ec50ebd: am b7e6a443: Merge "Routing workaround." into jb-mr2-dev | Robert Greenwalt | 2013-04-11 | 1 | -22/+23 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am b7e6a443: Merge "Routing workaround." into jb-mr2-dev | Robert Greenwalt | 2013-04-11 | 1 | -22/+23 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge "Routing workaround." into jb-mr2-dev | Robert Greenwalt | 2013-04-11 | 1 | -22/+23 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | | * | | | | | | Routing workaround. | Robert Greenwalt | 2013-04-09 | 1 | -22/+23 |
* | | | | | | | | | am 63582a79: am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" ... | Robert Greenwalt | 2013-04-11 | 1 | -5/+10 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev | Robert Greenwalt | 2013-04-11 | 1 | -5/+10 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev | Robert Greenwalt | 2013-04-11 | 1 | -5/+10 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | |||||
| | | * | | | | | | Use CONNECTIVITY_INTERNAL for global proxy | Robert Greenwalt | 2013-04-10 | 1 | -5/+10 |
* | | | | | | | | | am ea4f556f: am 651f99cb: Merge "Sensor values changes." into jb-mr2-dev | Jaikumar Ganesh | 2013-04-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am 651f99cb: Merge "Sensor values changes." into jb-mr2-dev | Jaikumar Ganesh | 2013-04-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Sensor values changes. | Jaikumar Ganesh | 2013-04-11 | 1 | -1/+1 |