summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-devEino-Ville Talvala2014-10-094-484/+2086
|\
| * Merge changes Id09663d8,Ie88f3750 into lmp-devEino-Ville Talvala2014-10-084-484/+2086
| |\
| | * Camera2: Docs cleanup, especially units and rangeEino-Ville Talvala2014-10-084-494/+1557
| | * camera2: Update docs only for legacy devicesIgor Murashkin2014-10-034-21/+560
* | | am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-devDianne Hackborn2014-10-0919-36/+35
|\ \ \ | |/ /
| * | Merge "Put in real "code" (aka marketing) name." into lmp-devDianne Hackborn2014-10-0819-36/+35
| |\ \
| | * | Put in real "code" (aka marketing) name.Dianne Hackborn2014-10-0719-36/+35
* | | | am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-devJeff Sharkey2014-10-091-0/+6
|\ \ \ \ | |/ / /
| * | | Merge "Bring along more ApplicationInfo fields." into lmp-devJeff Sharkey2014-10-081-0/+6
| |\ \ \
| | * | | Bring along more ApplicationInfo fields.Jeff Sharkey2014-10-081-0/+6
| * | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-081-1/+1
* | | | | am 2200f86f: All (er, L) is finally revealed.Dan Sandler2014-10-084-152/+217
|\ \ \ \ \ | |/ / / /
| * | | | All (er, L) is finally revealed.Dan Sandler2014-10-084-152/+217
| |/ / /
* | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-081-1/+1
* | | | am 32b9f4a6: Merge "Reapply animation duration scale each time it is started....Jeff Brown2014-10-081-1/+6
|\ \ \ \ | |/ / /
| * | | Merge "Reapply animation duration scale each time it is started." into lmp-devJeff Brown2014-10-071-1/+6
| |\ \ \
| | * | | Reapply animation duration scale each time it is started.Jeff Brown2014-10-071-1/+6
* | | | | am ae456fd8: Merge "Accept any restored wallpaper" into lmp-devChristopher Tate2014-10-071-20/+34
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Accept any restored wallpaper" into lmp-devChristopher Tate2014-10-071-20/+34
| |\ \ \ \
| | * | | | Accept any restored wallpaperChristopher Tate2014-10-061-20/+34
* | | | | | am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp...Adam Lesinski2014-10-071-13/+17
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Load shared library dependencies for AppWidgets" into lmp-devAdam Lesinski2014-10-071-13/+17
| |\ \ \ \ \
| | * | | | | Load shared library dependencies for AppWidgetsAdam Lesinski2014-10-071-13/+17
* | | | | | | am 258d2221: Fix build, previous commit failed to remove an importAndres Morales2014-10-071-1/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix build, previous commit failed to remove an importAndres Morales2014-10-071-1/+0
* | | | | | | am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-devAndres Morales2014-10-071-12/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Remove dead NFC unlock code from fw/base" into lmp-devAndres Morales2014-10-071-12/+0
| |\ \ \ \ \ \
| | * | | | | | Remove dead NFC unlock code from fw/baseAndres Morales2014-10-061-12/+0
* | | | | | | | am 41bb3455: Merge "Set the default user restrictions to disallow calling and...Amith Yamasani2014-10-071-0/+33
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Set the default user restrictions to disallow calling and sms" into lm...Amith Yamasani2014-10-071-0/+33
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Set the default user restrictions to disallow calling and smsAmith Yamasani2014-10-061-0/+33
* | | | | | | | Merge commit '69555fc2' into fix-merge-conflict3Amit Mahajan2014-10-063-0/+275
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Sms7BitEncodingTranslator" into lmp-devAmit Mahajan2014-10-073-0/+275
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Sms7BitEncodingTranslatorXia Ying2014-10-073-0/+275
* | | | | | | | am 99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-devJeff Sharkey2014-10-062-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Reduce PackageInstaller I/O pressure." into lmp-devJeff Sharkey2014-10-062-0/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Reduce PackageInstaller I/O pressure.Jeff Sharkey2014-10-062-0/+3
| | | |/ / / / / | | |/| | | | |
* | | | | | | | am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet l...Chris Craik2014-10-061-7/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Avoid changeBounds animations on Views that are not yet laidout" into ...Chris Craik2014-10-061-7/+10
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Avoid changeBounds animations on Views that are not yet laidoutChris Craik2014-10-061-7/+10
| | | |_|_|/ / | | |/| | | |
* | | | | | | am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-devMathieu Chartier2014-10-061-4/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix incorrect JNI_ABORT" into lmp-devMathieu Chartier2014-10-061-4/+4
| |\ \ \ \ \ \
| | * | | | | | Fix incorrect JNI_ABORTMathieu Chartier2014-10-061-4/+4
| | | |/ / / / | | |/| | | |
* | | | | | | am 17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-devAmit Mahajan2014-10-062-0/+40
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "ATT: Call does not establish to '*1'" into lmp-devAmit Mahajan2014-10-062-0/+40
| |\ \ \ \ \ \
| | * | | | | | ATT: Call does not establish to '*1'Bing Gao2014-10-062-0/+40
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-10-064-420/+420
| |\ \ \ \ \ \
| | * | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-064-420/+420
| | | |/ / / / | | |/| | | |
* | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-sprout-devGeoff Mendal2014-10-063-51/+51
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-063-51/+51