Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "MediaRecorderTest: verify capture fps meta key is set" | Chong Zhang | 2015-04-14 | 1 | -3/+31 |
|\ | |||||
| * | MediaRecorderTest: verify capture fps meta key is set | Chong Zhang | 2015-04-07 | 1 | -3/+31 |
* | | Merge "Always set the dataDir for the given userId" | Amith Yamasani | 2015-04-14 | 1 | -11/+7 |
|\ \ | |||||
| * | | Always set the dataDir for the given userId | Amith Yamasani | 2015-04-14 | 1 | -11/+7 |
* | | | Merge "Hide Phone proximity sensor methods" | Yorke Lee | 2015-04-14 | 2 | -2/+4 |
|\ \ \ | |||||
| * | | | Hide Phone proximity sensor methods | Yorke Lee | 2015-04-14 | 2 | -2/+4 |
* | | | | Merge "Fingerprint: Add hw token to the enroll() function." | Sasha Levitskiy | 2015-04-14 | 1 | -5/+9 |
|\ \ \ \ | |||||
| * | | | | Fingerprint: Add hw token to the enroll() function. | Sasha Levitskiy | 2015-04-14 | 1 | -5/+9 |
* | | | | | Merge "Add ComponentName.createRelative methods" | Adam Powell | 2015-04-14 | 3 | -0/+55 |
|\ \ \ \ \ | |||||
| * | | | | | Add ComponentName.createRelative methods | Adam Powell | 2015-04-14 | 3 | -0/+55 |
* | | | | | | Merge "Handle null package argument" | Amith Yamasani | 2015-04-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Handle null package argument | Amith Yamasani | 2015-04-14 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge "resolved conflicts for merge of 1d5a2592 to master" | Alex Klyubin | 2015-04-14 | 1 | -29/+2 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | resolved conflicts for merge of 1d5a2592 to master | Alex Klyubin | 2015-04-14 | 1 | -29/+2 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | am 6a38c86d: am d693690a: Merge "No need to specify EC curve name in EcIesPar... | Alex Klyubin | 2015-04-14 | 1 | -25/+2 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | am d693690a: Merge "No need to specify EC curve name in EcIesParameterSpec." | Alex Klyubin | 2015-04-14 | 1 | -25/+2 |
| | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ | Merge "No need to specify EC curve name in EcIesParameterSpec." | Alex Klyubin | 2015-04-14 | 1 | -25/+2 |
| | | | |\ \ \ \ \ | |||||
| | | | | * | | | | | No need to specify EC curve name in EcIesParameterSpec. | Alex Klyubin | 2015-04-13 | 1 | -25/+2 |
* | | | | | | | | | | Merge "Add versioning to FLP HAL." | David Christie | 2015-04-14 | 7 | -3/+74 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Add versioning to FLP HAL. | David Christie | 2015-04-14 | 7 | -3/+74 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge "Fix fingerprint API for 3rd party apps" | Jorim Jaggi | 2015-04-14 | 2 | -2/+24 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix fingerprint API for 3rd party apps | Jorim Jaggi | 2015-04-14 | 2 | -2/+24 |
* | | | | | | | | | | Merge "Don't crash if an application has an invalid icon" | Alan Viverette | 2015-04-14 | 1 | -46/+63 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Don't crash if an application has an invalid icon | Alan Viverette | 2015-04-13 | 1 | -46/+63 |
* | | | | | | | | | | | am fa2bd4fe: am 888f5cb7: am ecfda064: Merge "Make specifying self-signed cer... | Alex Klyubin | 2015-04-14 | 2 | -40/+64 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | am 888f5cb7: am ecfda064: Merge "Make specifying self-signed cert parameters ... | Alex Klyubin | 2015-04-14 | 2 | -40/+64 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | am ecfda064: Merge "Make specifying self-signed cert parameters optional." | Alex Klyubin | 2015-04-14 | 2 | -40/+64 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | | | |||||
| | | * | | | | | | | | Merge "Make specifying self-signed cert parameters optional." | Alex Klyubin | 2015-04-14 | 2 | -40/+64 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Make specifying self-signed cert parameters optional. | Alex Klyubin | 2015-04-14 | 2 | -40/+64 |
* | | | | | | | | | | | | Merge "Zen: Enter alarms only on volume down from vibrate." | John Spurlock | 2015-04-14 | 6 | -6/+32 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Zen: Enter alarms only on volume down from vibrate. | John Spurlock | 2015-04-14 | 6 | -6/+32 |
* | | | | | | | | | | | | | Merge "Zen: Add new user introduction msg for "Priority only"." | John Spurlock | 2015-04-14 | 16 | -62/+283 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Zen: Add new user introduction msg for "Priority only". | John Spurlock | 2015-04-14 | 16 | -62/+283 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | am d9e0abdf: am 04143fdd: am e38ee9df: Merge "Add Debug.getRuntimeStat()." | Hiroshi Yamauchi | 2015-04-14 | 1 | -0/+90 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | am 04143fdd: am e38ee9df: Merge "Add Debug.getRuntimeStat()." | Hiroshi Yamauchi | 2015-04-14 | 1 | -0/+90 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | am e38ee9df: Merge "Add Debug.getRuntimeStat()." | Hiroshi Yamauchi | 2015-04-14 | 1 | -0/+90 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | Merge "Add Debug.getRuntimeStat()." | Hiroshi Yamauchi | 2015-04-14 | 1 | -0/+90 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | | | |||||
| | | | * | | | | | | | | | Add Debug.getRuntimeStat(). | Hiroshi Yamauchi | 2015-04-14 | 1 | -0/+90 |
| | | |/ / / / / / / / / | |||||
* | | | | | | | | | | | | Merge "Mark the SUBSCRIBED_FEEDS_READ/WRITE permissions removed." | Svetoslav | 2015-04-14 | 4 | -0/+42 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Mark the SUBSCRIBED_FEEDS_READ/WRITE permissions removed. | Svetoslav | 2015-04-14 | 4 | -0/+42 |
* | | | | | | | | | | | | | Merge "Add setting flag to enable new contact aggregator" | Zheng Fu | 2015-04-14 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Add setting flag to enable new contact aggregator | Zheng Fu | 2015-04-13 | 1 | -0/+7 |
* | | | | | | | | | | | | | | Merge "Fixes to idle alarm scheduling, package importance." | Dianne Hackborn | 2015-04-14 | 14 | -88/+384 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Fixes to idle alarm scheduling, package importance. | Dianne Hackborn | 2015-04-14 | 14 | -88/+384 |
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge "Display a notification for a new guest" | Fyodor Kupolov | 2015-04-14 | 4 | -0/+96 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Display a notification for a new guest | Fyodor Kupolov | 2015-04-14 | 4 | -0/+96 |
* | | | | | | | | | | | | | | | Merge "Add more firstStrong alternatives for textDirection." | Roozbeh Pournader | 2015-04-14 | 5 | -8/+54 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Add more firstStrong alternatives for textDirection. | Roozbeh Pournader | 2015-04-13 | 5 | -8/+54 |
* | | | | | | | | | | | | | | | | Merge "camera2: add reprocess support" | Chien-Yu Chen | 2015-04-14 | 13 | -124/+784 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | camera2: add reprocess support | Chien-Yu Chen | 2015-04-13 | 13 | -124/+784 |