summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | | | Merge "Support more smaller scripts of Asia and Africa."Roozbeh Pournader2015-04-142-2/+66
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Support more smaller scripts of Asia and Africa.Roozbeh Pournader2015-04-132-2/+66
* | | | | | | | | | | | am 09339053: am 6ca1e45a: am 8704ae46: Merge "Add name to ScriptGroup2.Builde...Yang Ni2015-04-143-9/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am 6ca1e45a: am 8704ae46: Merge "Add name to ScriptGroup2.Builder.create() me...Yang Ni2015-04-143-9/+15
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | * | | | | | | | | | am 8704ae46: Merge "Add name to ScriptGroup2.Builder.create() method"Yang Ni2015-04-143-9/+15
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "Add name to ScriptGroup2.Builder.create() method"Yang Ni2015-04-143-9/+15
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Add name to ScriptGroup2.Builder.create() methodYang Ni2015-04-133-9/+15
* | | | | | | | | | | | | Merge "Use HandleView's previous offset for text selection handles"Mady Mellor2015-04-141-15/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Use HandleView's previous offset for text selection handlesMady Mellor2015-04-011-15/+7
* | | | | | | | | | | | | Merge changes from topic 'lss-update'Andres Morales2015-04-149-75/+480
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add challenge to IGateKeeperServiceAndres Morales2015-04-134-34/+171
| * | | | | | | | | | | | | Wire up GateKeeper to LockSettingsServiceAndres Morales2015-04-139-64/+332
* | | | | | | | | | | | | | Convert from glyph count to byte lengthTom Hudson2015-04-141-1/+1
* | | | | | | | | | | | | | Merge "Display toast when screen is unlocked to a work app."Kenny Guy2015-04-142-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Display toast when screen is unlocked to a work app.Kenny Guy2015-04-132-0/+22
* | | | | | | | | | | | | | | Make ActionBar animations work correctlyChet Haase2015-04-144-92/+45
* | | | | | | | | | | | | | | Merge "Show a status bar icon for managed profile activities."Kenny Guy2015-04-144-4/+113
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Show a status bar icon for managed profile activities.Kenny Guy2015-04-134-4/+113
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Introduce device owner API to disable the keyguard"Benjamin Franz2015-04-145-0/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Introduce device owner API to disable the keyguardBenjamin Franz2015-04-145-0/+49
* | | | | | | | | | | | | | | | Merge "Revert "Load WebView from one out of a list of packages.""Gustav Sennton2015-04-144-80/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Revert "Load WebView from one out of a list of packages."Gustav Sennton2015-04-144-80/+20
* | | | | | | | | | | | | | | | | am 73e056d3: am 402f2501: am 3312c6b9: Merge "Add android.net.IpPrefix#contai...Erik Kline2015-04-146-7/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | / / / / / / / / / / | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 402f2501: am 3312c6b9: Merge "Add android.net.IpPrefix#contains()"Erik Kline2015-04-146-7/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | |