summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 1944667b: am 8ced0357: am 2a88ff2f: Merge "Generate sysv hash for libjnigr...Dmitriy Ivanov2015-03-111-0/+3
|\
| * am 8ced0357: am 2a88ff2f: Merge "Generate sysv hash for libjnigraphics"Dmitriy Ivanov2015-03-101-0/+3
| |\
| | * am 2a88ff2f: Merge "Generate sysv hash for libjnigraphics"Dmitriy Ivanov2015-03-101-0/+3
| | |\
| | | * Merge "Generate sysv hash for libjnigraphics"Dmitriy Ivanov2015-03-101-0/+3
| | | |\
| | | | * Generate sysv hash for libjnigraphicsDmitriy Ivanov2015-03-091-0/+3
| | | |/
* | | | Merge "resolved conflicts for merge of b6d6c04a to master"Andreas Gampe2015-03-113-7/+9
|\ \ \ \
| * \ \ \ resolved conflicts for merge of b6d6c04a to masterAndreas Gampe2015-03-103-7/+9
| |\ \ \ \ | | |/ / /
| | * | | am 174a4488: am 7f383873: Merge "Frameworks/base: Pass APK debugability to in...Andreas Gampe2015-03-103-7/+9
| | |\ \ \ | | | |/ /
| | | * | am 7f383873: Merge "Frameworks/base: Pass APK debugability to installd"Andreas Gampe2015-03-103-7/+9
| | | |\ \ | | | | |/
| | | | * Merge "Frameworks/base: Pass APK debugability to installd"Andreas Gampe2015-03-093-7/+9
| | | | |\
| | | | | * Frameworks/base: Pass APK debugability to installdAndreas Gampe2015-03-093-7/+9
* | | | | | Merge "Notify TrustAgentService when device policy configuration no longer ap...Adrian Roos2015-03-112-6/+11
|\ \ \ \ \ \
| * | | | | | Notify TrustAgentService when device policy configuration no longer appliesAdrian Roos2015-03-092-6/+11
* | | | | | | Merge "Make settings XML files readable"Svetoslav2015-03-101-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Make settings XML files readableSvetoslav2015-03-101-1/+2
* | | | | | | | Merge "Handle simultaneous connect of devices with the same "type" (as in USB)"Paul McLean2015-03-102-98/+141
|\ \ \ \ \ \ \ \
| * | | | | | | | Handle simultaneous connect of devices with the same "type" (as in USB)Paul McLean2015-03-102-98/+141
* | | | | | | | | Merge "Add Phone.ENTERPRISE_CONTENT_URI"Ricky Wai2015-03-101-0/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add Phone.ENTERPRISE_CONTENT_URIRicky Wai2015-03-041-0/+23
* | | | | | | | | | Merge "Track down unsupported texture target"Chris Craik2015-03-103-2/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Track down unsupported texture targetChris Craik2015-03-103-2/+13
* | | | | | | | | | | Merge "Revert "Remove activity and window stacks when last task is removed.""Wale Ogunwale2015-03-103-26/+13
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Revert "Remove activity and window stacks when last task is removed."Wale Ogunwale2015-03-103-26/+13
* | | | | | | | | | | Merge "Correct docs to specify leading slash in paths."Craig Mautner2015-03-101-2/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Correct docs to specify leading slash in paths.Craig Mautner2015-03-051-2/+3
* | | | | | | | | | | | Merge "Add several CallSupers to View"Chris Craik2015-03-101-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add several CallSupers to ViewChris Craik2015-03-101-0/+6
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "ZenLog: Track changes to effect suppressorship."John Spurlock2015-03-102-0/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | ZenLog: Track changes to effect suppressorship.John Spurlock2015-03-092-0/+26
* | | | | | | | | | | | Remove unused settings constants from the SDK (framework).Svetoslav2015-03-105-36/+51
* | | | | | | | | | | | Merge "Move more file handling into LockSettingsStorage"Robin Lee2015-03-101-4/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Move more file handling into LockSettingsStorageRobin Lee2015-03-101-4/+12
* | | | | | | | | | | | | am 4c887ac9: am db7fa51f: am c7446790: Merge "ZygoteConnection: remove obsole...dcashman2015-03-101-148/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am db7fa51f: am c7446790: Merge "ZygoteConnection: remove obsolete security c...dcashman2015-03-091-148/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am c7446790: Merge "ZygoteConnection: remove obsolete security checks."dcashman2015-03-091-148/+22
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "ZygoteConnection: remove obsolete security checks."dcashman2015-03-091-148/+22
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | ZygoteConnection: remove obsolete security checks.dcashman2015-03-091-148/+22
| | | | | |_|_|_|_|_|_|_|/ | | | | |/| | | | | | | |
* | | | | | | | | | | | | am 502c30da: am 5427ac71: am 282099b5: am 5a604b35: am 00e3efb5: am f51020ea:...Rich Slogar2015-03-101-1/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 5427ac71: am 282099b5: am 5a604b35: am 00e3efb5: am f51020ea: am 6e1cbe43:...Rich Slogar2015-03-091-1/+30
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am 282099b5: am 5a604b35: am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs:...Rich Slogar2015-03-091-1/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ am 5a604b35: am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plug...Rich Slogar2015-03-091-1/+30
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle...Rich Slogar2015-03-091-1/+30
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1....Rich Slogar2015-03-091-1/+30
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release not...Rich Slogar2015-03-091-1/+30
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-...Rich Slogar2015-03-091-1/+30
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | | | | | docs: android plugin for gradle release 1.1.3 release notesRich Slogar2015-03-061-1/+30
* | | | | | | | | | | | | | | | | | | | Merge "Add support for the new native Builder class on StaticLayout."Diego Perez2015-03-101-2/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Add support for the new native Builder class on StaticLayout.Diego Perez2015-03-101-2/+36
* | | | | | | | | | | | | | | | | | | | | Merge "MediaSession: Notify PlaybackInfo callbacks when playback type changes."John Spurlock2015-03-101-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | MediaSession: Notify PlaybackInfo callbacks when playback type changes.John Spurlock2015-03-101-0/+2