summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | am 14dee803: am c7fdfe6b: am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Me...Deepanshu Gupta2014-04-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | am c7fdfe6b: am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text...Deepanshu Gupta2014-04-040-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in Fake...Deepanshu Gupta2014-04-040-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | | am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT ME...Deepanshu Gupta2014-04-041-1/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / /
| | | | | | * | | | | | | | | | | | | | am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb...Deepanshu Gupta2014-04-041-1/+1
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / /
| | | | | | | * | | | | | | | | | | | | Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-devDeepanshu Gupta2014-04-041-1/+1
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | | | | | | Fix text size in Fake Action Bar. [DO NOT MERGE]Deepanshu Gupta2014-03-271-1/+1
| | | | | | | | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge "Fix build due to bad javadoc link."Craig Mautner2014-04-041-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Fix build due to bad javadoc link.Craig Mautner2014-04-031-3/+1
* | | | | | | | | | | | | | | | | | | | | Merge "resolved conflicts for merge of 4f342e87 to master"Jeff Tinker2014-04-045-42/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 4f342e87 to masterJeff Tinker2014-04-035-42/+49
* | | | | | | | | | | | | | | | | | | | | | Significant preconditions are significantChristopher Tate2014-04-031-1/+1
* | | | | | | | | | | | | | | | | | | | | | am 72b2f536: (-s ours) am 76c484de: am d93b0b67: am e448bcf7: Merge "Add miss...Xavier Ducrohet2014-04-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am 76c484de: am d93b0b67: am e448bcf7: Merge "Add missing dependency in layou...Xavier Ducrohet2014-04-031-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | am d93b0b67: am e448bcf7: Merge "Add missing dependency in layoutlib build fi...Xavier Ducrohet2014-04-031-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | am e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT ME...Xavier Ducrohet2014-04-031-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into kl...Xavier Ducrohet2014-04-031-0/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | Add missing dependency in layoutlib build file [DO NOT MERGE]Deepanshu Gupta2014-03-311-0/+1
* | | | | | | | | | | | | | | | | | | | | | Merge "Adding activity icon to the task view"Winson Chung2014-04-038-98/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Adding activity icon to the task viewWinson Chung2014-04-028-98/+98
* | | | | | | | | | | | | | | | | | | | | | Merge "Add the persistable attribute for Activities"Craig Mautner2014-04-035-1/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Add the persistable attribute for ActivitiesCraig Mautner2014-04-035-1/+27
* | | | | | | | | | | | | | | | | | | | | | | Merge "Don't allow -1 uids for wake locks."Dianne Hackborn2014-04-032-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Don't allow -1 uids for wake locks.Dianne Hackborn2014-04-032-0/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Implement setActivityLabelAndIcon()."Craig Mautner2014-04-037-94/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Implement setActivityLabelAndIcon().Craig Mautner2014-03-317-94/+60
* | | | | | | | | | | | | | | | | | | | | | Merge "Enabled the new notification shade and improved expanding logic"Selim Cinek2014-04-0310-527/+536
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Enabled the new notification shade and improved expanding logicSelim Cinek2014-04-0310-527/+536
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge "Move most TransformationInfo properties to RenderNode"Chris Craik2014-04-039-640/+327
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Move most TransformationInfo properties to RenderNodeChris Craik2014-04-029-640/+327
* | | | | | | | | | | | | | | | | | | | | | am c333381b: am 24a2f20f: am c420ce34: Merge "Marquee text RTL improvements"Raph Levien2014-04-031-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am 24a2f20f: am c420ce34: Merge "Marquee text RTL improvements"Raph Levien2014-04-031-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c420ce34: Merge "Marquee text RTL improvements"Raph Levien2014-04-031-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Marquee text RTL improvements"Raph Levien2014-04-031-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | Marquee text RTL improvementsMichael Lekman2014-03-251-4/+4
* | | | | | | | | | | | | | | | | | | | | | | | | am 71ae2bd4: am f87b3a25: am 374db6c3: Merge "Remove ProcessState::mArgc,mArg...Narayan Kamath2014-04-034-28/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | am f87b3a25: am 374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen"Narayan Kamath2014-04-034-28/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | am 374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen"Narayan Kamath2014-04-034-28/+41
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "Remove ProcessState::mArgc,mArgV,mArgLen"Narayan Kamath2014-04-034-28/+41
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | Remove ProcessState::mArgc,mArgV,mArgLenNarayan Kamath2014-04-034-28/+41
| | | |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | am 55da6228: (-s ours) am 14424043: am 369a0057: Merge "Update ViewRootImpl f...Ben Murdoch2014-04-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | am 14424043: am 369a0057: Merge "Update ViewRootImpl for 64bit functor type."Ben Murdoch2014-04-031-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | am 369a0057: Merge "Update ViewRootImpl for 64bit functor type."Ben Murdoch2014-04-031-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "Update ViewRootImpl for 64bit functor type."Ben Murdoch2014-04-031-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | Update ViewRootImpl for 64bit functor type.Ben Murdoch2014-04-021-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Clean up on VectorDrawable."ztenghui2014-04-0342-11/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Clean up on VectorDrawable.ztenghui2014-04-0242-11/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | am c2cebee6: am 8db6d9af: Merge "Clean up certain state transitions in DreamS...Jeff Brown2014-04-031-35/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | am 8db6d9af: Merge "Clean up certain state transitions in DreamService." into...Jeff Brown2014-04-031-35/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "Clean up certain state transitions in DreamService." into klp-modular-devJeff Brown2014-04-031-35/+39
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \