summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* LayoutLib: Support getting resource arrays.Deepanshu Gupta2015-05-2622-14/+245
* LayoutLib: Change nullity annotations.Deepanshu Gupta2015-05-2236-53/+57
* Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc...Dianne Hackborn2015-05-2318-191/+76
|\
| * Revert "resolved conflicts for merge of 47249f2a to mnc-dev"Dianne Hackborn2015-05-2218-191/+76
* | Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into ...Simranjit Singh Kohli2015-05-232-26/+32
|\ \
| * | [ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]Simranjit Singh Kohli2015-05-222-26/+32
* | | am c56a8313: am b1410bc3: Merge "Doc change: updates for preview." into mnc-p...Dirk Dougherty2015-05-238-95/+16
|\ \ \
| * \ \ am b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docsDirk Dougherty2015-05-238-95/+16
| |\ \ \
| | * \ \ Merge "Doc change: updates for preview." into mnc-preview-docsDirk Dougherty2015-05-228-95/+16
| | |\ \ \
| | | * | | Doc change: updates for preview.Dirk Dougherty2015-05-228-95/+16
* | | | | | am 93cc5190: am b373f49a: docs: NDK table of contents fixesJoe Fernandez2015-05-234-60/+100
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am b373f49a: docs: NDK table of contents fixesJoe Fernandez2015-05-234-60/+100
| |\ \ \ \ \ | | |/ / / /
| | * | | | docs: NDK table of contents fixesJoe Fernandez2015-05-224-60/+100
| | |/ / /
* | | | | Merge "Add getPermissionGrantState method in device policy" into mnc-devAmith Yamasani2015-05-235-0/+60
|\ \ \ \ \
| * | | | | Add getPermissionGrantState method in device policyAmith Yamasani2015-05-225-0/+60
* | | | | | Merge "Camera: update available LSC map mode key type" into mnc-devYin-Chia Yeh2015-05-223-4/+4
|\ \ \ \ \ \
| * | | | | | Camera: update available LSC map mode key typeYin-Chia Yeh2015-05-223-4/+4
* | | | | | | am 09ffc01d: am 61e6be64: Merge "Doc change: updates for preview content." in...Dirk Dougherty2015-05-2222-44/+89
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | am 61e6be64: Merge "Doc change: updates for preview content." into mnc-previe...Dirk Dougherty2015-05-2222-44/+89
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "Doc change: updates for preview content." into mnc-preview-docsDirk Dougherty2015-05-2222-44/+89
| | |\ \ \ \
| | | * | | | Doc change: updates for preview content.Dirk Dougherty2015-05-2222-44/+89
* | | | | | | am eed8e782: am dd4dc4a0: resolved conflicts for merge of 7044ee16 to mnc-pre...David Friedman2015-05-2233-26/+5895
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am dd4dc4a0: resolved conflicts for merge of 7044ee16 to mnc-preview-docsDavid Friedman2015-05-2233-26/+5895
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | resolved conflicts for merge of 7044ee16 to mnc-preview-docsDavid Friedman2015-05-2233-26/+5895
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | am e23031c9: Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a s...David Friedman2015-05-2233-11/+5895
| | | |\ \ \ \
| | | | * | | | Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.David Friedman2015-05-2233-11/+5895
* | | | | | | | Merge "No longer trigger immersive cling on panic" into mnc-devAdrian Roos2015-05-221-16/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | No longer trigger immersive cling on panicAdrian Roos2015-05-211-16/+1
* | | | | | | | | Merge "Request transient bars after panic" into mnc-devAdrian Roos2015-05-221-3/+27
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Request transient bars after panicAdrian Roos2015-05-211-5/+27
* | | | | | | | | Merge "Camera2: update FpsRange requirement" into mnc-devYin-Chia Yeh2015-05-221-2/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Camera2: update FpsRange requirementYin-Chia Yeh2015-05-221-2/+20
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge "Suppress benign clang warning." into mnc-devChih-Hung Hsieh2015-05-221-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Suppress benign clang warning.Chih-Hung Hsieh2015-05-221-1/+3
* | | | | | | | | | Merge "ImageReader: Register estimated native allocation" into mnc-devChien-Yu Chen2015-05-222-0/+70
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ImageReader: Register estimated native allocationChien-Yu Chen2015-05-222-0/+70
* | | | | | | | | | | am d2632a83: (-s ours) am 8f585128: (-s ours) am d4e00d2b: (-s ours) Merge "R...Griff Hazen2015-05-220-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 8f585128: (-s ours) am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInte...Griff Hazen2015-05-220-0/+0
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch...Griff Hazen2015-05-210-0/+0
| | |\ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ am cc6029b8: (-s ours) am dc085ed2: (-s ours) am 5825ad23: (-s ours) Revert "...Griff Hazen2015-05-220-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am dc085ed2: (-s ours) am 5825ad23: (-s ours) Revert "Reduce display device l...Griff Hazen2015-05-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am 5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ...Griff Hazen2015-05-210-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | Doc update for MediaDrm's OnExpirationUpdate methodJeff Tinker2015-05-221-1/+2
* | | | | | | | | | | | | | Merge "Fixed a flash when launching keyguard affordances" into mnc-devSelim Cinek2015-05-222-7/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed a flash when launching keyguard affordancesSelim Cinek2015-05-222-7/+25
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Restore app expectations around drawable visibility change timing" int...Adam Powell2015-05-222-15/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Restore app expectations around drawable visibility change timingAdam Powell2015-05-222-15/+26
* | | | | | | | | | | | | | Merge "Improve reporting to apps of transaction too large failures." into mnc...Dianne Hackborn2015-05-228-13/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Improve reporting to apps of transaction too large failures.Dianne Hackborn2015-05-218-13/+52
* | | | | | | | | | | | | | Merge "Camera2: Implement toString() for camera2 params" into mnc-devChien-Yu Chen2015-05-223-0/+194
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |