summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Show the license dialog only if the activity is still showing" into jb...Amith Yamasani2012-08-231-1/+3
|\
| * Show the license dialog only if the activity is still showingAmith Yamasani2012-08-231-1/+3
* | Merge "Settings: Minimal refactor to support new dreams api." into jb-mr1-devJohn Spurlock2012-08-233-7/+21
|\ \
| * | Settings: Minimal refactor to support new dreams api.John Spurlock2012-08-233-7/+21
* | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-08-2249-153/+160
|\ \ \ | |_|/ |/| |
| * | Import translations. DO NOT MERGEBaligh Uddin2012-08-2249-153/+160
| |/
* | Merge "Simplify User management settings to bare minimum" into jb-mr1-devAmith Yamasani2012-08-222-126/+1
|\ \
| * | Simplify User management settings to bare minimumAmith Yamasani2012-08-222-126/+1
* | | Merge "Simplify proxy regex" into jb-mr1-devIrfan Sheriff2012-08-221-1/+1
|\ \ \
| * | | Simplify proxy regexIrfan Sheriff2012-08-221-1/+1
* | | | Merge "Update view on UI thread" into jb-mr1-devIrfan Sheriff2012-08-221-18/+23
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Update view on UI threadIrfan Sheriff2012-08-221-18/+23
| |/
* | Merge "Add a flag to control auto-brightness adjustment." into jb-mr1-devJeff Brown2012-08-211-5/+9
|\ \ | |/ |/|
| * Add a flag to control auto-brightness adjustment.Jeff Brown2012-08-211-5/+9
* | am 997b1f74: am 578700af: Merge "Settings: disable Lock SIM card till respons...Jean-Baptiste Queru2012-08-211-1/+3
|\ \
| * \ am 578700af: Merge "Settings: disable Lock SIM card till response is received"Jean-Baptiste Queru2012-08-211-1/+3
| |\ \
| | * \ Merge "Settings: disable Lock SIM card till response is received"Jean-Baptiste Queru2012-08-211-1/+3
| | |\ \
| | | * | Settings: disable Lock SIM card till response is receivedJeevaka Badrappan2012-08-211-1/+3
| | |/ /
* | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-08-2149-50/+235
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2149-50/+235
* | | | | Merge "Make manage apps UI multi-user aware." into jb-mr1-devDianne Hackborn2012-08-216-155/+500
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make manage apps UI multi-user aware.Dianne Hackborn2012-08-216-155/+500
* | | | | am 0de311b4: am c46455ac: Merge "Enable "APN roaming protocol" for all platfo...Jake Hamby2012-08-201-9/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am c46455ac: Merge "Enable "APN roaming protocol" for all platforms"Jake Hamby2012-08-201-9/+1
| |\ \ \ | | |/ /
| | * | Merge "Enable "APN roaming protocol" for all platforms"Jake Hamby2012-08-201-9/+1
| | |\ \
| | | * | Enable "APN roaming protocol" for all platformsTore Anderson2012-08-081-9/+1
* | | | | Merge "display wireless charging status" into jb-mr1-devBrian Muramatsu2012-08-203-6/+16
|\ \ \ \ \
| * | | | | display wireless charging statusBrian Muramatsu2012-08-143-6/+16
* | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-201-2/+2
| |_|_|_|/ |/| | | |
* | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-172-3/+3
* | | | | am 71742eb1: am 0c869d69: Merge "UsbSetting: The behavior is not right when e...Jean-Baptiste Queru2012-08-171-0/+18
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 0c869d69: Merge "UsbSetting: The behavior is not right when enable/disable...Jean-Baptiste Queru2012-08-171-0/+18
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with...Jean-Baptiste Queru2012-08-171-0/+18
| | |\ \ \
| | | * | | UsbSetting: The behavior is not right when enable/disable MTP/PTP with Access...Wu, Hao2012-08-161-0/+18
* | | | | | am f4cc034e: am d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox un...Jean-Baptiste Queru2012-08-171-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until...Jean-Baptiste Queru2012-08-171-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"Jean-Baptiste Queru2012-08-171-1/+1
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | TetheringSetting: Keep Tethering checkbox unchecked until tethering upLi Wenji2012-08-161-1/+1
| | |/ / /
* | | | | am 8543723f: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
| |\ \ \ \
| | * \ \ \ merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-08-160-0/+0
| | |\ \ \ \
* | | \ \ \ \ Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-08-163-8/+8
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-163-8/+8
* | | | | | | | Rename UserId to UserHandle.Dianne Hackborn2012-08-163-10/+10
|/ / / / / / /
* | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-158-12/+12
* | | | | | | Merge "Use new power manager API." into jb-mr1-devJeff Brown2012-08-152-44/+39
|\ \ \ \ \ \ \
| * | | | | | | Use new power manager API.Jeff Brown2012-08-142-44/+39
* | | | | | | | am 8ddcdbd4: (-s ours) am 11665038: Merge "Import translations. DO NOT MERGE"...Baligh Uddin2012-08-150-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 11665038: Merge "Import translations. DO NOT MERGE" into jb-devBaligh Uddin2012-08-150-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge "Import translations. DO NOT MERGE" into jb-devBaligh Uddin2012-08-150-0/+0
| | |\ \ \ \ \ \