Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "display wireless charging status" into jb-mr1-dev | Brian Muramatsu | 2012-08-20 | 3 | -6/+16 |
|\ | |||||
| * | display wireless charging status | Brian Muramatsu | 2012-08-14 | 3 | -6/+16 |
* | | Import translations. DO NOT MERGE | Baligh Uddin | 2012-08-20 | 1 | -2/+2 |
* | | Import translations. DO NOT MERGE | Baligh Uddin | 2012-08-17 | 2 | -3/+3 |
* | | am 71742eb1: am 0c869d69: Merge "UsbSetting: The behavior is not right when e... | Jean-Baptiste Queru | 2012-08-17 | 1 | -0/+18 |
|\ \ | |||||
| * \ | am 0c869d69: Merge "UsbSetting: The behavior is not right when enable/disable... | Jean-Baptiste Queru | 2012-08-17 | 1 | -0/+18 |
| |\ \ | |||||
| | * \ | Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with... | Jean-Baptiste Queru | 2012-08-17 | 1 | -0/+18 |
| | |\ \ | |||||
| | | * | | UsbSetting: The behavior is not right when enable/disable MTP/PTP with Access... | Wu, Hao | 2012-08-16 | 1 | -0/+18 |
* | | | | | am f4cc034e: am d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox un... | Jean-Baptiste Queru | 2012-08-17 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until... | Jean-Baptiste Queru | 2012-08-17 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up" | Jean-Baptiste Queru | 2012-08-17 | 1 | -1/+1 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | TetheringSetting: Keep Tethering checkbox unchecked until tethering up | Li Wenji | 2012-08-16 | 1 | -1/+1 |
| | |/ / | |||||
* | | | | am 8543723f: (-s ours) Reconcile with jb-mr0-release - do not merge | The Android Open Source Project | 2012-08-16 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Reconcile with jb-mr0-release - do not merge | The Android Open Source Project | 2012-08-16 | 0 | -0/+0 |
| |\ \ \ | |||||
| | * \ \ | merge in jb-mr0-release history after reset to jb-dev | The Android Automerger | 2012-08-16 | 0 | -0/+0 |
| | |\ \ \ | |||||
* | | \ \ \ | Merge "Import translations. DO NOT MERGE" into jb-mr1-dev | Baligh Uddin | 2012-08-16 | 3 | -8/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2012-08-16 | 3 | -8/+8 |
* | | | | | | | Rename UserId to UserHandle. | Dianne Hackborn | 2012-08-16 | 3 | -10/+10 |
|/ / / / / / | |||||
* | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2012-08-15 | 8 | -12/+12 |
* | | | | | | Merge "Use new power manager API." into jb-mr1-dev | Jeff Brown | 2012-08-15 | 2 | -44/+39 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use new power manager API. | Jeff Brown | 2012-08-14 | 2 | -44/+39 |
* | | | | | | | am 8ddcdbd4: (-s ours) am 11665038: Merge "Import translations. DO NOT MERGE"... | Baligh Uddin | 2012-08-15 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | am 11665038: Merge "Import translations. DO NOT MERGE" into jb-dev | Baligh Uddin | 2012-08-15 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge "Import translations. DO NOT MERGE" into jb-dev | Baligh Uddin | 2012-08-15 | 0 | -0/+0 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2012-08-14 | 4 | -23/+23 |
* | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-dev | Baligh Uddin | 2012-08-15 | 2 | -5/+3 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2012-08-14 | 20 | -83/+47 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | am 05e16515: (-s ours) am cb5624b8: Merge "Import translations. DO NOT MERGE"... | Baligh Uddin | 2012-08-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | am cb5624b8: Merge "Import translations. DO NOT MERGE" into jb-dev | Baligh Uddin | 2012-08-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge "Import translations. DO NOT MERGE" into jb-dev | Baligh Uddin | 2012-08-14 | 0 | -0/+0 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2012-08-13 | 4 | -23/+23 |
| | | | |/ / / | | | |/| | | | |||||
* | | | | | | | am 133c8ca5: (-s ours) am c5acc132: Import translations. DO NOT MERGE | Baligh Uddin | 2012-08-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am c5acc132: Import translations. DO NOT MERGE | Baligh Uddin | 2012-08-14 | 4 | -23/+23 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2012-08-14 | 4 | -23/+23 |
| | |/ / / / | |||||
* | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-dev | Baligh Uddin | 2012-08-14 | 20 | -78/+44 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2012-08-14 | 20 | -78/+44 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | am 291389ed: am 5dbc1f64: Merge "Fix use of holo drawables in a few more places" | Jean-Baptiste Queru | 2012-08-14 | 3 | -3/+3 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | am 5dbc1f64: Merge "Fix use of holo drawables in a few more places" | Jean-Baptiste Queru | 2012-08-14 | 3 | -3/+3 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge "Fix use of holo drawables in a few more places" | Jean-Baptiste Queru | 2012-08-14 | 3 | -3/+3 |
| | |\ \ \ \ | |||||
| | | * | | | | Fix use of holo drawables in a few more places | Björn Lundén | 2012-08-14 | 3 | -3/+3 |
| | |/ / / / | |||||
* | | | | | | Fix for setting TTS language to recently downloaded one | Przemyslaw Szczepaniak | 2012-08-14 | 2 | -12/+14 |
| |_|/ / / |/| | | | | |||||
* | | | | | am 865a914f: am 42eb3fb2: Merge "Fix the issue the setting crashes after unmo... | Jeff Sharkey | 2012-08-13 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 42eb3fb2: Merge "Fix the issue the setting crashes after unmount SD card i... | Jeff Sharkey | 2012-08-13 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "Fix the issue the setting crashes after unmount SD card in landscape" | Jeff Sharkey | 2012-08-13 | 1 | -2/+2 |
| | |\ \ \ | |||||
| | | * | | | Fix the issue the setting crashes after unmount SD card in landscape | Chuanxiao Dong | 2012-08-10 | 1 | -2/+2 |
* | | | | | | am 677e2ff6: am d7db6baa: Merge "Don\'t direct to market if no markets instal... | Jeff Sharkey | 2012-08-13 | 1 | -3/+14 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am d7db6baa: Merge "Don\'t direct to market if no markets installed" | Jeff Sharkey | 2012-08-13 | 1 | -3/+14 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge "Don't direct to market if no markets installed" | Jeff Sharkey | 2012-08-13 | 1 | -3/+14 |
| | |\ \ \ \ | |||||
| | | * | | | | Don't direct to market if no markets installed | Xingrun Chen | 2012-07-26 | 1 | -3/+14 |
* | | | | | | | am 6fb425e2: am eefa61ed: Merge "Settings: Use ICS alert drawable" | Jean-Baptiste Queru | 2012-08-13 | 12 | -19/+19 |
|\ \ \ \ \ \ \ | |/ / / / / / |