summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-144-23/+23
* | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-08-152-5/+3
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-1420-83/+47
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | am 05e16515: (-s ours) am cb5624b8: Merge "Import translations. DO NOT MERGE"...Baligh Uddin2012-08-140-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am cb5624b8: Merge "Import translations. DO NOT MERGE" into jb-devBaligh Uddin2012-08-140-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Import translations. DO NOT MERGE" into jb-devBaligh Uddin2012-08-140-0/+0
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-134-23/+23
| | | | |/ / / | | | |/| | |
* | | | | | | am 133c8ca5: (-s ours) am c5acc132: Import translations. DO NOT MERGEBaligh Uddin2012-08-140-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c5acc132: Import translations. DO NOT MERGEBaligh Uddin2012-08-144-23/+23
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-144-23/+23
| | |/ / / /
* | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-08-1420-78/+44
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-1420-78/+44
| | |_|/ / / | |/| | | |
* | | | | | am 291389ed: am 5dbc1f64: Merge "Fix use of holo drawables in a few more places"Jean-Baptiste Queru2012-08-143-3/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 5dbc1f64: Merge "Fix use of holo drawables in a few more places"Jean-Baptiste Queru2012-08-143-3/+3
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "Fix use of holo drawables in a few more places"Jean-Baptiste Queru2012-08-143-3/+3
| | |\ \ \ \
| | | * | | | Fix use of holo drawables in a few more placesBjörn Lundén2012-08-143-3/+3
| | |/ / / /
* | | | | | Fix for setting TTS language to recently downloaded onePrzemyslaw Szczepaniak2012-08-142-12/+14
| |_|/ / / |/| | | |
* | | | | am 865a914f: am 42eb3fb2: Merge "Fix the issue the setting crashes after unmo...Jeff Sharkey2012-08-131-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 42eb3fb2: Merge "Fix the issue the setting crashes after unmount SD card i...Jeff Sharkey2012-08-131-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix the issue the setting crashes after unmount SD card in landscape"Jeff Sharkey2012-08-131-2/+2
| | |\ \ \
| | | * | | Fix the issue the setting crashes after unmount SD card in landscapeChuanxiao Dong2012-08-101-2/+2
* | | | | | am 677e2ff6: am d7db6baa: Merge "Don\'t direct to market if no markets instal...Jeff Sharkey2012-08-131-3/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am d7db6baa: Merge "Don\'t direct to market if no markets installed"Jeff Sharkey2012-08-131-3/+14
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Don't direct to market if no markets installed"Jeff Sharkey2012-08-131-3/+14
| | |\ \ \ \
| | | * | | | Don't direct to market if no markets installedXingrun Chen2012-07-261-3/+14
* | | | | | | am 6fb425e2: am eefa61ed: Merge "Settings: Use ICS alert drawable"Jean-Baptiste Queru2012-08-1312-19/+19
|\ \ \ \ \ \ \ | |/ / / / / /