summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* MWI,phantom call,Suppl services, error codesShriram Ganesh2015-07-0611-3/+172
* Rename VoLTE/WFC enable API to available - add VT available API.Etan Cohen2015-07-062-18/+35
* am 10c111ed: Merge "Show basic feature warning for default granted permission...Svet Ganov2015-07-064-17/+48
|\
| * Merge "Show basic feature warning for default granted permissions" into mnc-devSvet Ganov2015-07-064-17/+48
| |\
| | * Show basic feature warning for default granted permissionsSvet Ganov2015-07-034-17/+48
* | | am cb8d2e21: Merge "Improve request permission docs" into mnc-devSvet Ganov2015-07-062-0/+14
|\ \ \ | |/ /
| * | Merge "Improve request permission docs" into mnc-devSvet Ganov2015-07-062-0/+14
| |\ \
| | * | Improve request permission docsSvet Ganov2015-07-032-0/+14
| | |/
* | | am 7fe86c47: Merge "Fix docs for ViewAnimationUtils.createCircularReveal" int...George Mount2015-07-062-6/+8
|\ \ \ | |/ /
| * | Merge "Fix docs for ViewAnimationUtils.createCircularReveal" into mnc-devGeorge Mount2015-07-062-6/+8
| |\ \
| | * | Fix docs for ViewAnimationUtils.createCircularRevealGeorge Mount2015-07-012-6/+8
* | | | am a5595900: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-060-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-066-11/+11
| |\ \ \
| | * | | Import translations. DO NOT MERGEGeoff Mendal2015-07-066-11/+11
* | | | | am 210b38d7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-060-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-066-9/+9
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-066-9/+9
| | |/ / /
* | | | | am b0819373: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-060-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-063-31/+31
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-063-31/+31
| | |/ / /
* | | | | am 88b4a0ac: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-060-0/+0
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Import translations. DO NOT MERGEGeoff Mendal2015-07-061-3/+3
|/ / /
* | | Fix two parsing bugs in new DHCP client.Lorenzo Colitti2015-07-062-11/+169
* | | Merge "Fixing log typo. s/realted/related" into mnc-devIan Pedowitz2015-07-051-1/+1
|\ \ \
| * | | Fixing log typo. s/realted/relatedIan Pedowitz2015-07-051-1/+1
| | |/ | |/|
* | | Fix app ops aidl as it is also used from native.Svet Ganov2015-07-031-2/+2
|/ /
* | Merge "KeyChain: annotate with @WorkerThread" into mnc-devRobin Lee2015-07-031-4/+15
|\ \
| * | KeyChain: annotate with @WorkerThreadRobin Lee2015-06-301-4/+15
* | | Merge "Make the VPN notice connectivity changes on stacked interfaces." into ...Lorenzo Colitti2015-07-031-1/+1
|\ \ \
| * | | Make the VPN notice connectivity changes on stacked interfaces.Lorenzo Colitti2015-07-021-1/+1
* | | | Merge "Grant the default gallery app storage permissions" into mnc-devSvet Ganov2015-07-021-0/+10
|\ \ \ \
| * | | | Grant the default gallery app storage permissionsSvet Ganov2015-07-011-0/+10
* | | | | Merge "Make granting default SMS and Phone permissions robust" into mnc-devSvetoslav2015-07-022-38/+136
|\ \ \ \ \
| * | | | | Make granting default SMS and Phone permissions robustSvetoslav2015-07-012-38/+136
* | | | | | Merge "Add capability to indicate a conference will never have children." int...Anthony Lee2015-07-021-2/+26
|\ \ \ \ \ \
| * | | | | | Add capability to indicate a conference will never have children.Tyler Gunn2015-06-291-2/+26
* | | | | | | Merge "Remove ExternalMediaFormatActivity" into mnc-devRubin Xu2015-07-024-128/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove ExternalMediaFormatActivityRubin Xu2015-07-024-128/+0
* | | | | | | | Merge "Clear "profile wiped" notification when a new porfile is created" into...Alex Chau2015-07-021-0/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Clear "profile wiped" notification when a new porfile is createdAlex Chau2015-06-301-0/+9
* | | | | | | | Merge "In NfcActivityManager, don't use UserHandle.CURRENT." into mnc-devNicolas Prevot2015-07-021-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | In NfcActivityManager, don't use UserHandle.CURRENT.Nicolas Prevot2015-07-011-1/+1
* | | | | | | | | Merge "Fix the case where an intent bounces several times between users." int...Nicolas Prevot2015-07-023-5/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix the case where an intent bounces several times between users.Nicolas Prevot2015-07-013-5/+9
| |/ / / / / / / /
* | | | | | | | | am 2ebfc3f7: am fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. B...David Friedman2015-07-0236-5/+11584
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. Bug: 20503708"...David Friedman2015-07-0236-5/+11584
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into mnc-pre...David Friedman2015-07-0236-5/+11584
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Docs: Localization of Design pages on DAC.David Friedman2015-07-0136-5/+11584
* | | | | | | | | | | | am 5adc6ba0: am 7e4dc922: Merge "Docs: Fixes a terminology error in simplifie...David Friedman2015-07-0210-215/+215
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 7e4dc922: Merge "Docs: Fixes a terminology error in simplified Chinese on-...David Friedman2015-07-0210-215/+215
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /