summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "MediaRecorderTest: verify capture fps meta key is set"Chong Zhang2015-04-141-3/+31
|\
| * MediaRecorderTest: verify capture fps meta key is setChong Zhang2015-04-071-3/+31
* | Merge "Always set the dataDir for the given userId"Amith Yamasani2015-04-141-11/+7
|\ \
| * | Always set the dataDir for the given userIdAmith Yamasani2015-04-141-11/+7
* | | Merge "Hide Phone proximity sensor methods"Yorke Lee2015-04-142-2/+4
|\ \ \
| * | | Hide Phone proximity sensor methodsYorke Lee2015-04-142-2/+4
* | | | Merge "Fingerprint: Add hw token to the enroll() function."Sasha Levitskiy2015-04-141-5/+9
|\ \ \ \
| * | | | Fingerprint: Add hw token to the enroll() function.Sasha Levitskiy2015-04-141-5/+9
* | | | | Merge "Add ComponentName.createRelative methods"Adam Powell2015-04-143-0/+55
|\ \ \ \ \
| * | | | | Add ComponentName.createRelative methodsAdam Powell2015-04-143-0/+55
* | | | | | Merge "Handle null package argument"Amith Yamasani2015-04-141-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Handle null package argumentAmith Yamasani2015-04-141-1/+1
| | |_|/ / | |/| | |
* | | | | Merge "resolved conflicts for merge of 1d5a2592 to master"Alex Klyubin2015-04-141-29/+2
|\ \ \ \ \
| * \ \ \ \ resolved conflicts for merge of 1d5a2592 to masterAlex Klyubin2015-04-141-29/+2
| |\ \ \ \ \
| | * \ \ \ \ am 6a38c86d: am d693690a: Merge "No need to specify EC curve name in EcIesPar...Alex Klyubin2015-04-141-25/+2
| | |\ \ \ \ \
| | | * \ \ \ \ am d693690a: Merge "No need to specify EC curve name in EcIesParameterSpec."Alex Klyubin2015-04-141-25/+2
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge "No need to specify EC curve name in EcIesParameterSpec."Alex Klyubin2015-04-141-25/+2
| | | | |\ \ \ \ \
| | | | | * | | | | No need to specify EC curve name in EcIesParameterSpec.Alex Klyubin2015-04-131-25/+2
* | | | | | | | | | Merge "Add versioning to FLP HAL."David Christie2015-04-147-3/+74
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add versioning to FLP HAL.David Christie2015-04-147-3/+74
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge "Fix fingerprint API for 3rd party apps"Jorim Jaggi2015-04-142-2/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix fingerprint API for 3rd party appsJorim Jaggi2015-04-142-2/+24
* | | | | | | | | | Merge "Don't crash if an application has an invalid icon"Alan Viverette2015-04-141-46/+63
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't crash if an application has an invalid iconAlan Viverette2015-04-131-46/+63
* | | | | | | | | | | am fa2bd4fe: am 888f5cb7: am ecfda064: Merge "Make specifying self-signed cer...Alex Klyubin2015-04-142-40/+64
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 888f5cb7: am ecfda064: Merge "Make specifying self-signed cert parameters ...Alex Klyubin2015-04-142-40/+64
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am ecfda064: Merge "Make specifying self-signed cert parameters optional."Alex Klyubin2015-04-142-40/+64
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge "Make specifying self-signed cert parameters optional."Alex Klyubin2015-04-142-40/+64
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Make specifying self-signed cert parameters optional.Alex Klyubin2015-04-142-40/+64
* | | | | | | | | | | | Merge "Zen: Enter alarms only on volume down from vibrate."John Spurlock2015-04-146-6/+32
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Zen: Enter alarms only on volume down from vibrate.John Spurlock2015-04-146-6/+32
* | | | | | | | | | | | | Merge "Zen: Add new user introduction msg for "Priority only"."John Spurlock2015-04-1416-62/+283
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Zen: Add new user introduction msg for "Priority only".John Spurlock2015-04-1416-62/+283
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | am d9e0abdf: am 04143fdd: am e38ee9df: Merge "Add Debug.getRuntimeStat()."Hiroshi Yamauchi2015-04-141-0/+90
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am 04143fdd: am e38ee9df: Merge "Add Debug.getRuntimeStat()."Hiroshi Yamauchi2015-04-141-0/+90
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am e38ee9df: Merge "Add Debug.getRuntimeStat()."Hiroshi Yamauchi2015-04-141-0/+90
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "Add Debug.getRuntimeStat()."Hiroshi Yamauchi2015-04-141-0/+90
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Add Debug.getRuntimeStat().Hiroshi Yamauchi2015-04-141-0/+90
| | | |/ / / / / / / / /
* | | | | | | | | | | | Merge "Mark the SUBSCRIBED_FEEDS_READ/WRITE permissions removed."Svetoslav2015-04-144-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Mark the SUBSCRIBED_FEEDS_READ/WRITE permissions removed.Svetoslav2015-04-144-0/+42
* | | | | | | | | | | | | Merge "Add setting flag to enable new contact aggregator"Zheng Fu2015-04-141-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add setting flag to enable new contact aggregatorZheng Fu2015-04-131-0/+7
* | | | | | | | | | | | | | Merge "Fixes to idle alarm scheduling, package importance."Dianne Hackborn2015-04-1414-88/+384
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixes to idle alarm scheduling, package importance.Dianne Hackborn2015-04-1414-88/+384
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Display a notification for a new guest"Fyodor Kupolov2015-04-144-0/+96
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Display a notification for a new guestFyodor Kupolov2015-04-144-0/+96
* | | | | | | | | | | | | | | Merge "Add more firstStrong alternatives for textDirection."Roozbeh Pournader2015-04-145-8/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add more firstStrong alternatives for textDirection.Roozbeh Pournader2015-04-135-8/+54
* | | | | | | | | | | | | | | | Merge "camera2: add reprocess support"Chien-Yu Chen2015-04-1413-124/+784
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | camera2: add reprocess supportChien-Yu Chen2015-04-1313-124/+784