summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2013-02-1552-10/+402
* am 1ef6a106: Merge "Fix Settings app crash after enabled multi-user"Amith Yamasani2013-02-151-2/+2
|\
| * Merge "Fix Settings app crash after enabled multi-user"Amith Yamasani2013-02-151-2/+2
| |\
| | * Fix Settings app crash after enabled multi-userJaewan Kim2013-02-041-2/+2
* | | resolved conflicts for merge of bbe409d3 to masterKenny Root2013-02-142-3/+3
|\ \ \ | |/ /
| * | Merge "KeyStore: stop using state()"Kenny Root2013-02-143-7/+5
| |\ \
| | * | KeyStore: stop using state()Kenny Root2013-02-143-7/+5
| |/ /
* | | App ops: new labels, fix crash, fix updating list.Dianne Hackborn2013-02-133-20/+33
* | | Merge "Use updated enterprise API"Irfan Sheriff2013-02-121-9/+9
|\ \ \
| * | | Use updated enterprise APIIrfan Sheriff2013-02-121-9/+9
* | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-02-126-19/+19
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2013-02-126-19/+19
| |/ / /
* | | | Show the user's list of notifications in Settings.Daniel Sandler2013-02-1210-0/+550
|/ / /
* | | Import translations. DO NOT MERGEBaligh Uddin2013-02-1136-104/+1848
* | | Import translations. DO NOT MERGEBaligh Uddin2013-02-0876-1723/+1335
* | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-02-0896-7785/+4580
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-02-0696-7785/+4580
* | | | Clean up RTL in Wi-Fi details dialog.Jeff Sharkey2013-02-072-13/+22
* | | | Merge "Update theme of ActivityPicker"Michael Jurka2013-02-071-1/+1
|\ \ \ \
| * | | | Update theme of ActivityPickerMichael Jurka2013-02-061-1/+1
* | | | | Merge "App ops: add "draw on top" op, improve switch ordering."Dianne Hackborn2013-02-072-7/+25
|\ \ \ \ \
| * | | | | App ops: add "draw on top" op, improve switch ordering.Dianne Hackborn2013-02-072-7/+25
* | | | | | am 5c879e48: am 414d9e9c: Merge "P2PSetting:Avoid p2p_find on group removal e...Irfan Sheriff2013-02-061-1/+7
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | am 414d9e9c: Merge "P2PSetting:Avoid p2p_find on group removal event"Irfan Sheriff2013-02-061-1/+7
| |\ \ \ \ \
| | * \ \ \ \ Merge "P2PSetting:Avoid p2p_find on group removal event"Irfan Sheriff2013-02-061-1/+7
| | |\ \ \ \ \
| | | * | | | | P2PSetting:Avoid p2p_find on group removal eventsunil duttu2013-02-061-1/+7
| | |/ / / / /
* | | | | | | Merge "Fix EAP field display for a new network"Irfan Sheriff2013-02-061-0/+5
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix EAP field display for a new networkIrfan Sheriff2013-02-061-0/+5
| | |_|_|/ / | |/| | | |
* | | | | | am 6639dee4: am 203631b2: Merge "wifiSettings: Updating the networkinfo on su...Irfan Sheriff2013-02-061-1/+6
|\ \ \ \ \ \ | | |/ / / / | |/| | / / | |_|_|/ / |/| | | |
| * | | | am 203631b2: Merge "wifiSettings: Updating the networkinfo on supplicant event"Irfan Sheriff2013-02-061-1/+6
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "wifiSettings: Updating the networkinfo on supplicant event"Irfan Sheriff2013-02-061-1/+6
| | |\ \ \
| | | * | | wifiSettings: Updating the networkinfo on supplicant eventsunil duttu2013-02-061-1/+6
| | |/ / /
* | | | | Merge "App ops: add modify settings op."Dianne Hackborn2013-02-062-7/+11
|\ \ \ \ \
| * | | | | App ops: add modify settings op.Dianne Hackborn2013-02-052-7/+11
* | | | | | Merge "fix an issue where sensors power usage wasn't reported properly"Mathias Agopian2013-02-061-6/+10
|\ \ \ \ \ \
| * | | | | | fix an issue where sensors power usage wasn't reported properlyMathias Agopian2013-02-041-6/+10
* | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-02-0598-4084/+7800
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-02-0498-4084/+7800
| | |_|_|/ / | |/| | | |
* | | | | | App ops: add UI for SMS ops.Dianne Hackborn2013-02-053-5/+46
* | | | | | Merge "Improve error message to figure out which fragment class is problematic."Amith Yamasani2013-02-051-2/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Improve error message to figure out which fragment class is problematic.Amith Yamasani2013-02-051-2/+5
* | | | | | Merge "Settings: Add setting to clear adb public keys"Benoit Goby2013-02-023-1/+44
|\ \ \ \ \ \
| * | | | | | Settings: Add setting to clear adb public keysBenoit Goby2013-01-223-1/+44
* | | | | | | App ops: improve presentation.Dianne Hackborn2013-02-014-62/+68
* | | | | | | App ops: Support neighboring cells, call phone, improve UI.Dianne Hackborn2013-02-015-65/+139
* | | | | | | Merge "Use non-breaking hyphen for "Wi-Fi""Russell Brenner2013-02-011-64/+64
|\ \ \ \ \ \ \
| * | | | | | | Use non-breaking hyphen for "Wi-Fi"Russell Brenner2013-02-011-64/+64
* | | | | | | | Migrate package notification controls to AppOps.Daniel Sandler2013-02-014-4/+7
|/ / / / / / /
* | | | | | | Merge "Fix bugs with null AppOp permissions."Daniel Sandler2013-02-012-38/+42
|\ \ \ \ \ \ \
| * | | | | | | Fix bugs with null AppOp permissions.Daniel Sandler2013-01-312-38/+42