summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "TM TaskServiceContext implementation"Matthew Williams2014-05-168-124/+718
|\
| * TM TaskServiceContext implementationMatthew Williams2014-05-168-124/+718
* | Merge "Revert "Revert "Modify TelephonyManager to expose sendEnvelopeWithStat...Evan Charlton2014-05-163-9/+12
|\ \
| * | Revert "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus inst...Evan Charlton2014-05-163-9/+12
* | | Merge "Revert "Revert "Expose sendEnvelope."""Evan Charlton2014-05-162-4/+45
|\ \ \ | |/ /
| * | Revert "Revert "Expose sendEnvelope.""Evan Charlton2014-05-162-4/+45
* | | Merge "Update ripple behavior, use render thread animation"Alan Viverette2014-05-169-410/+765
|\ \ \
| * | | Update ripple behavior, use render thread animationAlan Viverette2014-05-169-410/+765
* | | | Merge "Add a script to rename fonts for SDK."Deepanshu Gupta2014-05-164-0/+174
|\ \ \ \
| * | | | Add a script to rename fonts for SDK.Deepanshu Gupta2014-05-164-0/+174
* | | | | Merge "Trust Agents: Withhold trust until user has authenticated"Adrian Roos2014-05-161-0/+10
|\ \ \ \ \
| * | | | | Trust Agents: Withhold trust until user has authenticatedAdrian Roos2014-05-161-0/+10
* | | | | | Merge "Trust Agents: Implement DPM override"Adrian Roos2014-05-161-2/+31
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Trust Agents: Implement DPM overrideAdrian Roos2014-05-161-2/+31
* | | | | | Merge "Add drawable padding to check box and radio button styles"Alan Viverette2014-05-161-1/+6
|\ \ \ \ \ \
| * | | | | | Add drawable padding to check box and radio button stylesAlan Viverette2014-05-141-1/+6
* | | | | | | Merge "Fix recording of wake_lock_in."Dianne Hackborn2014-05-163-10/+21
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix recording of wake_lock_in.Dianne Hackborn2014-05-163-10/+21
* | | | | | | Merge "Variant of sendBroadcast with appOp flag for cross-user."Amith Yamasani2014-05-165-0/+48
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Variant of sendBroadcast with appOp flag for cross-user.Amith Yamasani2014-05-165-0/+48
* | | | | | | Merge "Add a setting for data reduction proxy key"Selim Gurun2014-05-161-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Add a setting for data reduction proxy keySelim Gurun2014-05-161-0/+8
* | | | | | | | Merge "Fix NPE in DevicePolicyManagerService"Jason Monk2014-05-161-11/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix NPE in DevicePolicyManagerServiceJason Monk2014-05-161-11/+13
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge "Get rid of dirFlags log spam"Raph Levien2014-05-161-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Get rid of dirFlags log spamRaph Levien2014-05-161-1/+0
* | | | | | | | Merge "camera2: Move parameters around to different packages"Igor Murashkin2014-05-1627-223/+102
|\ \ \ \ \ \ \ \
| * | | | | | | | camera2: Move parameters around to different packagesIgor Murashkin2014-05-1427-223/+102
* | | | | | | | | Merge "LayoutLib: Correctly resolve ?attr/foo"Deepanshu Gupta2014-05-161-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | LayoutLib: Correctly resolve ?attr/fooDeepanshu Gupta2014-05-151-1/+1
* | | | | | | | | | am cfa27161: am 50c11659: Fix Notification sdk docs build.Griff Hazen2014-05-161-2/+2
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 50c11659: Fix Notification sdk docs build.Griff Hazen2014-05-161-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix Notification sdk docs build.Griff Hazen2014-05-161-2/+2
* | | | | | | | | | | | resolved conflicts for merge of 313c5f38 to masterJohn Reck2014-05-161-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | am f18aed83: am 0661ddee: Merge "Enable display list updates with zero delta ...John Reck2014-05-161-4/+0
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am 0661ddee: Merge "Enable display list updates with zero delta time"John Reck2014-05-161-4/+0
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge "Enable display list updates with zero delta time"John Reck2014-05-161-4/+0
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Enable display list updates with zero delta timeTina Zhang2014-05-151-4/+0
* | | | | | | | | | | | | | Merge "Notify AppOpsService of UserRestrictions and Owners"Jason Monk2014-05-166-0/+234
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Notify AppOpsService of UserRestrictions and OwnersJason Monk2014-05-166-0/+234
* | | | | | | | | | | | | | | Merge "Missing progress bar style."Dan Sandler2014-05-161-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Missing progress bar style.Dan Sandler2014-05-161-0/+4
* | | | | | | | | | | | | | | | Merge "resolved conflicts for merge of de35b636 to master"Griff Hazen2014-05-162-20/+136
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | resolved conflicts for merge of de35b636 to masterGriff Hazen2014-05-162-20/+136
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am 959591e3: Add support for extendable actions to Notification.Griff Hazen2014-05-162-19/+135
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Add support for extendable actions to Notification.Griff Hazen2014-05-152-19/+135
* | | | | | | | | | | | | | | | Merge "Clean up when we switch networks."Robert Greenwalt2014-05-162-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Clean up when we switch networks.Robert Greenwalt2014-05-162-0/+5
* | | | | | | | | | | | | | | | | Merge "Updated typography for notifications."Dan Sandler2014-05-162-9/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Updated typography for notifications.Dan Sandler2014-05-162-9/+5
generated by cgit v1.1 at 2025-01-25 16:05:45 +0000