summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 3cf0640d: Merge "Add primitive shadows support to LayoutLib" into lmp-dev ...Deepanshu Gupta2014-11-1020-59/+798
|\
| * Merge "Add primitive shadows support to LayoutLib" into lmp-devDeepanshu Gupta2014-11-1020-59/+798
| |\
| | * Merge "Add primitive shadows support to LayoutLib" into lmp-devDeepanshu Gupta2014-11-1020-59/+798
| | |\
| | | * Add primitive shadows support to LayoutLibDeepanshu Gupta2014-11-0720-59/+798
* | | | am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev autom...Deepanshu Gupta2014-11-102-50/+43
|\ \ \ \ | |/ / /
| * | | Merge "Remove needlessly thrown IOException." into lmp-devDeepanshu Gupta2014-11-102-50/+43
| |\ \ \ | | |/ /
| | * | Merge "Remove needlessly thrown IOException." into lmp-devDeepanshu Gupta2014-11-102-50/+43
| | |\ \ | | | |/
| | | * Remove needlessly thrown IOException.Deepanshu Gupta2014-11-062-50/+43
* | | | Merge "Add caching to LockSettingsStorage" into lmp-mr1-devAdrian Roos2014-11-102-37/+224
|\ \ \ \
| * | | | Add caching to LockSettingsStorageAdrian Roos2014-11-102-37/+224
* | | | | Merge "Apply @hide / @SystemApi to android.telecom.*" into lmp-mr1-devEvan Charlton2014-11-1016-345/+89
|\ \ \ \ \
| * | | | | Apply @hide / @SystemApi to android.telecom.*Evan Charlton2014-11-1016-345/+89
* | | | | | Merge "split-select: Fix rules generated for anydpi density" into lmp-mr1-devAdam Lesinski2014-11-1012-245/+350
|\ \ \ \ \ \
| * | | | | | split-select: Fix rules generated for anydpi densityAdam Lesinski2014-11-0612-245/+350
* | | | | | | Merge "Zen: Pull next-alarm tracking out into separate helper." into lmp-mr1-devJohn Spurlock2014-11-104-205/+340
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Zen: Pull next-alarm tracking out into separate helper.John Spurlock2014-11-104-205/+340
* | | | | | | Make add-call a global property of telecom. (1/4)Santos Cordon2014-11-105-8/+53
| |_|/ / / / |/| | | | |
* | | | | | Merge "Disable LockPatternUtilsCache" into lmp-mr1-devAdrian Roos2014-11-104-7/+50
|\ \ \ \ \ \
| * | | | | | Disable LockPatternUtilsCacheAdrian Roos2014-11-104-7/+50
* | | | | | | Merge "Fix Keyguard affordances for RTL" into lmp-mr1-devJorim Jaggi2014-11-102-0/+14
|\ \ \ \ \ \ \
| * | | | | | | Fix Keyguard affordances for RTLJorim Jaggi2014-11-102-0/+14
* | | | | | | | Merge "Clean up encapsulation in date picker classes" into lmp-mr1-devAlan Viverette2014-11-104-139/+107
|\ \ \ \ \ \ \ \
| * | | | | | | | Clean up encapsulation in date picker classesAlan Viverette2014-11-064-139/+107
* | | | | | | | | Merge "Fix inset hinting when adding window" into lmp-mr1-devDan Sandler2014-11-109-32/+45
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix inset hinting when adding windowAdrian Roos2014-11-109-32/+45
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge "Fix build" into lmp-mr1-devAndres Morales2014-11-101-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix buildAndres Morales2014-11-101-0/+1
* | | | | | | | | | am d53436a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-spr...Geoff Mendal2014-11-100-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-sprout-devGeoff Mendal2014-11-103-88/+88
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-103-88/+88
* | | | | | | | | | | Merge "Fix NetworkMonitor logging to include NetID." into lmp-mr1-devPaul Jensen2014-11-101-0/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix NetworkMonitor logging to include NetID.Paul Jensen2014-11-101-0/+6
* | | | | | | | | | | | Merge "Update above/below backgrounds in PopupWindow.setBackground()" into lm...Alan Viverette2014-11-101-42/+42
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update above/below backgrounds in PopupWindow.setBackground()Alan Viverette2014-11-071-42/+42
* | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2014-11-1072-91/+1234
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-1072-91/+1234
* | | | | | | | | | | | | | am abf58f98: am 43f46ab9: am e627b94c: Merge "docs: Material design shadow fi...Ricardo Cervera2014-11-102-12/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am 43f46ab9: am e627b94c: Merge "docs: Material design shadow fixes." into lm...Ricardo Cervera2014-11-102-12/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am e627b94c: Merge "docs: Material design shadow fixes." into lmp-docsRicardo Cervera2014-11-102-12/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge "docs: Material design shadow fixes." into lmp-docsRicardo Cervera2014-11-102-12/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | docs: Material design shadow fixes.Ricardo Cervera2014-11-072-12/+20
* | | | | | | | | | | | | | | | Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-devAndres Morales2014-11-101-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Unhide DISALLOW_OUTGOING_BEAMAndres Morales2014-11-061-1/+0
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Expand WearableExtender to customize labels." into lmp-mr1-devPete Gast2014-11-102-1/+96
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Expand WearableExtender to customize labels.Pete Gast2014-10-072-1/+96
* | | | | | | | | | | | | | | | Merge "Adjust owner info to spec" into lmp-mr1-devJorim Jaggi2014-11-103-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Adjust owner info to specJorim Jaggi2014-11-073-3/+3
| | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Allow PathMotion to affect translations in ChangeTransform." into lmp-...George Mount2014-11-101-11/+90
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Allow PathMotion to affect translations in ChangeTransform.George Mount2014-11-051-11/+90
* | | | | | | | | | | | | | | | | am 547b9ba1: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |