summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Remove deprecated telecom APIs. Mark others final."Jay Shrauner2015-04-158-52/+10
|\
| * Remove deprecated telecom APIs. Mark others final.Jay Shrauner2015-04-148-52/+10
* | Merge "Camera2: Add prepare method for output buffer pre-allocation"Eino-Ville Talvala2015-04-1511-20/+219
|\ \
| * | Camera2: Add prepare method for output buffer pre-allocationEino-Ville Talvala2015-04-1411-20/+219
* | | Merge "@hide Binder#blockUntilThreadAvailable API"Wale Ogunwale2015-04-153-2/+1
|\ \ \
| * | | @hide Binder#blockUntilThreadAvailable APIWale Ogunwale2015-04-153-2/+1
* | | | Merge "Introduce device owner API to disable the status bar"Benjamin Franz2015-04-157-8/+91
|\ \ \ \
| * | | | Introduce device owner API to disable the status barBenjamin Franz2015-04-157-8/+91
* | | | | Merge "Hide Voicemail APIs"Jay Shrauner2015-04-153-51/+1
|\ \ \ \ \
| * | | | | Hide Voicemail APIsJay Shrauner2015-04-143-51/+1
| | |_|_|/ | |/| | |
* | | | | Merge "Fix ApplicationPackageManager.getDrawable() should drawable result"Ricky Wai2015-04-151-1/+3
|\ \ \ \ \
| * | | | | Fix ApplicationPackageManager.getDrawable() should drawable resultRicky Wai2015-04-151-1/+3
* | | | | | Merge "Simplify state in View#draw(canvas, parent, drawingTime)"Chris Craik2015-04-151-96/+62
|\ \ \ \ \ \
| * | | | | | Simplify state in View#draw(canvas, parent, drawingTime)Chris Craik2015-04-141-96/+62
* | | | | | | Merge "Changes for TelecomManager API review"Yorke Lee2015-04-153-19/+14
|\ \ \ \ \ \ \
| * | | | | | | Changes for TelecomManager API reviewYorke Lee2015-04-143-19/+14
* | | | | | | | Merge "A bunch more cleanups"John Reck2015-04-1522-192/+91
|\ \ \ \ \ \ \ \
| * | | | | | | | A bunch more cleanupsJohn Reck2015-04-1422-192/+91
* | | | | | | | | am 360d0f61: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-04-150-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-04-152-3/+3
* | | | | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-04-1573-5088/+4642
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-04-1573-5088/+4642
* | | | | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-04-1573-62/+1023
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-04-1573-62/+1023
| |/ / / / / / / / /
* | | | | | | | | | Merge "Added watchdog monitor for Binder threads availability."Wale Ogunwale2015-04-156-3/+26
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Added watchdog monitor for Binder threads availability.Wale Ogunwale2015-04-146-3/+26
* | | | | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-04-1573-195/+61
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-04-1573-195/+61
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-04-1573-135/+803
|/ / / / / / / / /
* | | | | | | | | Merge changes from topic 'no_internet'Lorenzo Colitti2015-04-158-11/+228
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add a noInternetAccessExpected boolean to WifiConfiguration.Lorenzo Colitti2015-04-151-0/+12
| * | | | | | | | | Prompt if a network without an Internet connection is selectedLorenzo Colitti2015-04-156-10/+209
| * | | | | | | | | Give SystemUI the OVERRIDE_WIFI_CONFIG permission.Lorenzo Colitti2015-04-151-0/+1
| * | | | | | | | | Add an UNKNOWN_UID constant to WifiConfiguration.Lorenzo Colitti2015-04-151-1/+6
* | | | | | | | | | Merge "Mark AVRCP devices as internal."Michael Wright2015-04-151-0/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Mark AVRCP devices as internal.Michael Wright2015-03-111-0/+19
* | | | | | | | | | | am 6fb80b70: am 99e23088: am 150e0e87: Merge "fix return value scale of notif...Michael Wright2015-04-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 99e23088: am 150e0e87: Merge "fix return value scale of notifyANR()"Michael Wright2015-04-151-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am 150e0e87: Merge "fix return value scale of notifyANR()"Michael Wright2015-04-151-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge "fix return value scale of notifyANR()"Michael Wright2015-04-151-1/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | fix return value scale of notifyANR()baik.han2015-04-151-1/+1
* | | | | | | | | | | | | | am 1f440cb0: am 895f3c27: am 6a47a861: Merge "Add getPrefixAids()."Martijn Coenen2015-04-151-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 895f3c27: am 6a47a861: Merge "Add getPrefixAids()."Martijn Coenen2015-04-151-1/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am 6a47a861: Merge "Add getPrefixAids()."Martijn Coenen2015-04-151-1/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Merge "Add getPrefixAids()."Martijn Coenen2015-04-151-1/+14
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | Add getPrefixAids().Martijn Coenen2015-04-151-1/+14
* | | | | | | | | | | | | | Merge "Fix a SecurityException in setKeyguardEnabledState"Benjamin Franz2015-04-151-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix a SecurityException in setKeyguardEnabledStateBenjamin Franz2015-04-141-4/+4
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Unhide PopupWindow window layout type calls"Chris Banes2015-04-153-5/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Unhide PopupWindow window layout type callsChris Banes2015-04-143-5/+12