Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev | Eino-Ville Talvala | 2014-10-09 | 4 | -484/+2086 |
|\ | |||||
| * | Merge changes Id09663d8,Ie88f3750 into lmp-dev | Eino-Ville Talvala | 2014-10-08 | 4 | -484/+2086 |
| |\ | |||||
| | * | Camera2: Docs cleanup, especially units and range | Eino-Ville Talvala | 2014-10-08 | 4 | -494/+1557 |
| | * | camera2: Update docs only for legacy devices | Igor Murashkin | 2014-10-03 | 4 | -21/+560 |
* | | | am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev | Dianne Hackborn | 2014-10-09 | 19 | -36/+35 |
|\ \ \ | |/ / | |||||
| * | | Merge "Put in real "code" (aka marketing) name." into lmp-dev | Dianne Hackborn | 2014-10-08 | 19 | -36/+35 |
| |\ \ | |||||
| | * | | Put in real "code" (aka marketing) name. | Dianne Hackborn | 2014-10-07 | 19 | -36/+35 |
* | | | | am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev | Jeff Sharkey | 2014-10-09 | 1 | -0/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "Bring along more ApplicationInfo fields." into lmp-dev | Jeff Sharkey | 2014-10-08 | 1 | -0/+6 |
| |\ \ \ | |||||
| | * | | | Bring along more ApplicationInfo fields. | Jeff Sharkey | 2014-10-08 | 1 | -0/+6 |
| * | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2014-10-08 | 1 | -1/+1 |
* | | | | | am 2200f86f: All (er, L) is finally revealed. | Dan Sandler | 2014-10-08 | 4 | -152/+217 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | All (er, L) is finally revealed. | Dan Sandler | 2014-10-08 | 4 | -152/+217 |
| |/ / / | |||||
* | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2014-10-08 | 1 | -1/+1 |
* | | | | am 32b9f4a6: Merge "Reapply animation duration scale each time it is started.... | Jeff Brown | 2014-10-08 | 1 | -1/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "Reapply animation duration scale each time it is started." into lmp-dev | Jeff Brown | 2014-10-07 | 1 | -1/+6 |
| |\ \ \ | |||||
| | * | | | Reapply animation duration scale each time it is started. | Jeff Brown | 2014-10-07 | 1 | -1/+6 |
* | | | | | am ae456fd8: Merge "Accept any restored wallpaper" into lmp-dev | Christopher Tate | 2014-10-07 | 1 | -20/+34 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge "Accept any restored wallpaper" into lmp-dev | Christopher Tate | 2014-10-07 | 1 | -20/+34 |
| |\ \ \ \ | |||||
| | * | | | | Accept any restored wallpaper | Christopher Tate | 2014-10-06 | 1 | -20/+34 |
* | | | | | | am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp... | Adam Lesinski | 2014-10-07 | 1 | -13/+17 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge "Load shared library dependencies for AppWidgets" into lmp-dev | Adam Lesinski | 2014-10-07 | 1 | -13/+17 |
| |\ \ \ \ \ | |||||
| | * | | | | | Load shared library dependencies for AppWidgets | Adam Lesinski | 2014-10-07 | 1 | -13/+17 |
* | | | | | | | am 258d2221: Fix build, previous commit failed to remove an import | Andres Morales | 2014-10-07 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Fix build, previous commit failed to remove an import | Andres Morales | 2014-10-07 | 1 | -1/+0 |
* | | | | | | | am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev | Andres Morales | 2014-10-07 | 1 | -12/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Remove dead NFC unlock code from fw/base" into lmp-dev | Andres Morales | 2014-10-07 | 1 | -12/+0 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Remove dead NFC unlock code from fw/base | Andres Morales | 2014-10-06 | 1 | -12/+0 |
* | | | | | | | | am 41bb3455: Merge "Set the default user restrictions to disallow calling and... | Amith Yamasani | 2014-10-07 | 1 | -0/+33 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "Set the default user restrictions to disallow calling and sms" into lm... | Amith Yamasani | 2014-10-07 | 1 | -0/+33 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | Set the default user restrictions to disallow calling and sms | Amith Yamasani | 2014-10-06 | 1 | -0/+33 |
* | | | | | | | | Merge commit '69555fc2' into fix-merge-conflict3 | Amit Mahajan | 2014-10-06 | 3 | -0/+275 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "Sms7BitEncodingTranslator" into lmp-dev | Amit Mahajan | 2014-10-07 | 3 | -0/+275 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | Sms7BitEncodingTranslator | Xia Ying | 2014-10-07 | 3 | -0/+275 |
* | | | | | | | | am 99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev | Jeff Sharkey | 2014-10-06 | 2 | -0/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "Reduce PackageInstaller I/O pressure." into lmp-dev | Jeff Sharkey | 2014-10-06 | 2 | -0/+3 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Reduce PackageInstaller I/O pressure. | Jeff Sharkey | 2014-10-06 | 2 | -0/+3 |
| | | |/ / / / / | | |/| | | | | | |||||
* | | | | | | | | am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet l... | Chris Craik | 2014-10-06 | 1 | -7/+10 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "Avoid changeBounds animations on Views that are not yet laidout" into ... | Chris Craik | 2014-10-06 | 1 | -7/+10 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | Avoid changeBounds animations on Views that are not yet laidout | Chris Craik | 2014-10-06 | 1 | -7/+10 |
| | | |_|_|/ / | | |/| | | | | |||||
* | | | | | | | am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev | Mathieu Chartier | 2014-10-06 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Fix incorrect JNI_ABORT" into lmp-dev | Mathieu Chartier | 2014-10-06 | 1 | -4/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix incorrect JNI_ABORT | Mathieu Chartier | 2014-10-06 | 1 | -4/+4 |
| | | |/ / / / | | |/| | | | | |||||
* | | | | | | | am 17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev | Amit Mahajan | 2014-10-06 | 2 | -0/+40 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "ATT: Call does not establish to '*1'" into lmp-dev | Amit Mahajan | 2014-10-06 | 2 | -0/+40 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | ATT: Call does not establish to '*1' | Bing Gao | 2014-10-06 | 2 | -0/+40 |
| | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-dev | Geoff Mendal | 2014-10-06 | 4 | -420/+420 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2014-10-06 | 4 | -420/+420 |
| | | |/ / / / | | |/| | | | | |||||
* | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev | Geoff Mendal | 2014-10-06 | 3 | -51/+51 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2014-10-06 | 3 | -51/+51 |