summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Directories are always enabled; update assets.Jeff Sharkey2013-09-2610-25/+30
* Merge "Camera2: Implement CameraManager#getCameraCharacteristics" into klp-devZhijun He2013-09-253-3/+25
|\
| * Camera2: Implement CameraManager#getCameraCharacteristicsZhijun He2013-09-253-3/+25
* | am 6b1f6feb: am ad95c415: am 857814c6: add mention of google cloud to Android...Scott Main2013-09-251-1/+5
|\ \
| * \ am ad95c415: am 857814c6: add mention of google cloud to Android Studio landi...Scott Main2013-09-251-1/+5
| |\ \
| | * \ am 857814c6: add mention of google cloud to Android Studio landing pageScott Main2013-09-251-1/+5
| | |\ \
| | | * | add mention of google cloud to Android Studio landing pageScott Main2013-09-251-1/+5
* | | | | Merge "Update toast appearance" into klp-devAdam Powell2013-09-256-1/+5
|\ \ \ \ \
| * | | | | Update toast appearanceAdam Powell2013-09-256-1/+5
* | | | | | Merge "Fix issue #10903002: com.facebook.katana keeps itself in A Services" i...Dianne Hackborn2013-09-257-113/+279
|\ \ \ \ \ \
| * | | | | | Fix issue #10903002: com.facebook.katana keeps itself in A ServicesDianne Hackborn2013-09-257-113/+279
* | | | | | | Merge "Require that persistable Uri permissions be taken." into klp-devJeff Sharkey2013-09-2513-238/+581
|\ \ \ \ \ \ \
| * | | | | | | Require that persistable Uri permissions be taken.Jeff Sharkey2013-09-2513-238/+581
* | | | | | | | Merge "wappush: Use valid index for pdu including garbages" into klp-devJake Hamby2013-09-252-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | wappush: Use valid index for pdu including garbagesSungmin Choi2013-09-252-0/+5
* | | | | | | | | Merge "Moving Launcher permission to Framework. (Bug 10343529)" into klp-devWinson Chung2013-09-253-0/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Moving Launcher permission to Framework. (Bug 10343529)Winson Chung2013-09-253-0/+39
| |/ / / / / / / /
* | | | | | | | | Merge "Accessibility improvements in keyguard - add accessibility description...Jim Miller2013-09-2514-13/+132
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Accessibility improvements in keyguardJim Miller2013-09-2514-13/+132
* | | | | | | | | | Take SkBitmap's stride into account when uploading texturesRomain Guy2013-09-255-18/+29
* | | | | | | | | | Merge "Update docs to state that mark is no longer called." into klp-devLeon Scroggins III2013-09-252-0/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update docs to state that mark is no longer called.Leon Scroggins III2013-09-252-0/+10
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Fix caption rendering" into klp-devAlan Viverette2013-09-252-89/+65
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix caption renderingAlan Viverette2013-09-252-89/+65
* | | | | | | | | | | Merge "Fit and finish for navbar camera affordance" into klp-devJim Miller2013-09-252-4/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fit and finish for navbar camera affordanceJim Miller2013-09-242-4/+8
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Fix accessibility for all-caps items in keyguard" into klp-devJim Miller2013-09-258-38/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix accessibility for all-caps items in keyguardJim Miller2013-09-248-38/+17
| |/ / / / / / / / /
* | | | | | | | | | Merge "Handle null stacks gracefully." into klp-devJeff Sharkey2013-09-253-3/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Handle null stacks gracefully.Jeff Sharkey2013-09-253-3/+5
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge "Fix an incorrectly created race accessing Wifi Supplicant" into klp-devVinit Deshapnde2013-09-251-19/+35
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix an incorrectly created race accessing Wifi SupplicantVinit Deshapnde2013-09-241-19/+35
* | | | | | | | | | Merge "Fix hang" into klp-devMarco Nelissen2013-09-251-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix hangMarco Nelissen2013-09-251-1/+1
* | | | | | | | | | Merge "Camera2: Add PASSIVE_UNFOCUSED autofocus state." into klp-devEino-Ville Talvala2013-09-253-5/+17
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Camera2: Add PASSIVE_UNFOCUSED autofocus state.Eino-Ville Talvala2013-09-203-5/+17
* | | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-2520-38/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-2520-38/+20
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-251-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-251-2/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-2555-0/+81
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-2555-0/+81
| |/ / / / / / / / /
* | | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-2555-9362/+4683
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-2555-9362/+4683
| |/ / / / / / / / /
* | | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-251-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-251-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-2555-49/+3125
|/ / / / / / / / /
* | | | | | | | | Merge "Don't change the text in reaction to a user dict add" into klp-devJean Chalard2013-09-251-66/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Don't change the text in reaction to a user dict addJean Chalard2013-09-121-66/+0
* | | | | | | | | Merge "Don't crash when no alarms are scheduled" into klp-devChristopher Tate2013-09-251-3/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |