Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | LayoutLib: Support getting resource arrays. | Deepanshu Gupta | 2015-05-26 | 22 | -14/+245 |
* | LayoutLib: Change nullity annotations. | Deepanshu Gupta | 2015-05-22 | 36 | -53/+57 |
* | Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc... | Dianne Hackborn | 2015-05-23 | 18 | -191/+76 |
|\ | |||||
| * | Revert "resolved conflicts for merge of 47249f2a to mnc-dev" | Dianne Hackborn | 2015-05-22 | 18 | -191/+76 |
* | | Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into ... | Simranjit Singh Kohli | 2015-05-23 | 2 | -26/+32 |
|\ \ | |||||
| * | | [ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes] | Simranjit Singh Kohli | 2015-05-22 | 2 | -26/+32 |
* | | | am c56a8313: am b1410bc3: Merge "Doc change: updates for preview." into mnc-p... | Dirk Dougherty | 2015-05-23 | 8 | -95/+16 |
|\ \ \ | |||||
| * \ \ | am b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docs | Dirk Dougherty | 2015-05-23 | 8 | -95/+16 |
| |\ \ \ | |||||
| | * \ \ | Merge "Doc change: updates for preview." into mnc-preview-docs | Dirk Dougherty | 2015-05-22 | 8 | -95/+16 |
| | |\ \ \ | |||||
| | | * | | | Doc change: updates for preview. | Dirk Dougherty | 2015-05-22 | 8 | -95/+16 |
* | | | | | | am 93cc5190: am b373f49a: docs: NDK table of contents fixes | Joe Fernandez | 2015-05-23 | 4 | -60/+100 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am b373f49a: docs: NDK table of contents fixes | Joe Fernandez | 2015-05-23 | 4 | -60/+100 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | docs: NDK table of contents fixes | Joe Fernandez | 2015-05-22 | 4 | -60/+100 |
| | |/ / / | |||||
* | | | | | Merge "Add getPermissionGrantState method in device policy" into mnc-dev | Amith Yamasani | 2015-05-23 | 5 | -0/+60 |
|\ \ \ \ \ | |||||
| * | | | | | Add getPermissionGrantState method in device policy | Amith Yamasani | 2015-05-22 | 5 | -0/+60 |
* | | | | | | Merge "Camera: update available LSC map mode key type" into mnc-dev | Yin-Chia Yeh | 2015-05-22 | 3 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Camera: update available LSC map mode key type | Yin-Chia Yeh | 2015-05-22 | 3 | -4/+4 |
* | | | | | | | am 09ffc01d: am 61e6be64: Merge "Doc change: updates for preview content." in... | Dirk Dougherty | 2015-05-22 | 22 | -44/+89 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | am 61e6be64: Merge "Doc change: updates for preview content." into mnc-previe... | Dirk Dougherty | 2015-05-22 | 22 | -44/+89 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge "Doc change: updates for preview content." into mnc-preview-docs | Dirk Dougherty | 2015-05-22 | 22 | -44/+89 |
| | |\ \ \ \ | |||||
| | | * | | | | Doc change: updates for preview content. | Dirk Dougherty | 2015-05-22 | 22 | -44/+89 |
* | | | | | | | am eed8e782: am dd4dc4a0: resolved conflicts for merge of 7044ee16 to mnc-pre... | David Friedman | 2015-05-22 | 33 | -26/+5895 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am dd4dc4a0: resolved conflicts for merge of 7044ee16 to mnc-preview-docs | David Friedman | 2015-05-22 | 33 | -26/+5895 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | resolved conflicts for merge of 7044ee16 to mnc-preview-docs | David Friedman | 2015-05-22 | 33 | -26/+5895 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | am e23031c9: Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a s... | David Friedman | 2015-05-22 | 33 | -11/+5895 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL. | David Friedman | 2015-05-22 | 33 | -11/+5895 |
* | | | | | | | | Merge "No longer trigger immersive cling on panic" into mnc-dev | Adrian Roos | 2015-05-22 | 1 | -16/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | No longer trigger immersive cling on panic | Adrian Roos | 2015-05-21 | 1 | -16/+1 |
* | | | | | | | | | Merge "Request transient bars after panic" into mnc-dev | Adrian Roos | 2015-05-22 | 1 | -3/+27 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Request transient bars after panic | Adrian Roos | 2015-05-21 | 1 | -5/+27 |
* | | | | | | | | | Merge "Camera2: update FpsRange requirement" into mnc-dev | Yin-Chia Yeh | 2015-05-22 | 1 | -2/+20 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Camera2: update FpsRange requirement | Yin-Chia Yeh | 2015-05-22 | 1 | -2/+20 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge "Suppress benign clang warning." into mnc-dev | Chih-Hung Hsieh | 2015-05-22 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Suppress benign clang warning. | Chih-Hung Hsieh | 2015-05-22 | 1 | -1/+3 |
* | | | | | | | | | | Merge "ImageReader: Register estimated native allocation" into mnc-dev | Chien-Yu Chen | 2015-05-22 | 2 | -0/+70 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | ImageReader: Register estimated native allocation | Chien-Yu Chen | 2015-05-22 | 2 | -0/+70 |
* | | | | | | | | | | | am d2632a83: (-s ours) am 8f585128: (-s ours) am d4e00d2b: (-s ours) Merge "R... | Griff Hazen | 2015-05-22 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | am 8f585128: (-s ours) am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInte... | Griff Hazen | 2015-05-22 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch... | Griff Hazen | 2015-05-21 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ \ \ \ | am cc6029b8: (-s ours) am dc085ed2: (-s ours) am 5825ad23: (-s ours) Revert "... | Griff Hazen | 2015-05-22 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | am dc085ed2: (-s ours) am 5825ad23: (-s ours) Revert "Reduce display device l... | Griff Hazen | 2015-05-22 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | am 5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ... | Griff Hazen | 2015-05-21 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | Doc update for MediaDrm's OnExpirationUpdate method | Jeff Tinker | 2015-05-22 | 1 | -1/+2 |
* | | | | | | | | | | | | | | Merge "Fixed a flash when launching keyguard affordances" into mnc-dev | Selim Cinek | 2015-05-22 | 2 | -7/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Fixed a flash when launching keyguard affordances | Selim Cinek | 2015-05-22 | 2 | -7/+25 |
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge "Restore app expectations around drawable visibility change timing" int... | Adam Powell | 2015-05-22 | 2 | -15/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Restore app expectations around drawable visibility change timing | Adam Powell | 2015-05-22 | 2 | -15/+26 |
* | | | | | | | | | | | | | | Merge "Improve reporting to apps of transaction too large failures." into mnc... | Dianne Hackborn | 2015-05-22 | 8 | -13/+52 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Improve reporting to apps of transaction too large failures. | Dianne Hackborn | 2015-05-21 | 8 | -13/+52 |
* | | | | | | | | | | | | | | Merge "Camera2: Implement toString() for camera2 params" into mnc-dev | Chien-Yu Chen | 2015-05-22 | 3 | -0/+194 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |