summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | Merge "Disconnect without CTRL-EVENT-DISCONNECTED" into ics-mr0Irfan Sheriff2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c0a87dc1: Merge "Fix issue 5462427: Volume should never be 0 ..." into ics...Eric Laurent2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge "Fix issue 5462427: Volume should never be 0 ..." into ics-mr0Eric Laurent2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a84e37f3: Merge "Fix 5468644: Use the proper audio stream type to play sou...Chih-Chung Chang2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "Fix 5468644: Use the proper audio stream type to play sound." into ics...Chih-Chung Chang2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | am 6f13adb2: Merge "Don\'t hold onto the lock while reconnecting to the serve...Dave Burke2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Don't hold onto the lock while reconnecting to the server" into ics-mr0Dave Burke2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | am 9a7e4ce7: Merge "Fix 5466678: use new setSystemUiVisibility() API to enabl...Jim Miller2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge "Fix 5466678: use new setSystemUiVisibility() API to enable clock in st...Jim Miller2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7788c51d: Merge "Fix onFirstLayout path for saved pages" into ics-mr0John Reck2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "Fix onFirstLayout path for saved pages" into ics-mr0John Reck2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | / / / / / / / / | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | am f129988a: Merge "Bullet points updated and permission colors are not orang...Peter Ng2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge "Bullet points updated and permission colors are not orange" into ics-mr0Peter Ng2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e95a1190: Merge "Update unlock halo asset" into ics-mr0Justin Ho2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "Update unlock halo asset" into ics-mr0Justin Ho2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | am 0f86772a: Merge "Update text select handles" into ics-mr0Justin Ho2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "Update text select handles" into ics-mr0Justin Ho2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am c598fcf4: Merge "Update stat_sys icons with different resize method" into ...Justin Ho2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "Update stat_sys icons with different resize method" into ics-mr0Justin Ho2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am 49317b77: Merge "Update spinner assets" into ics-mr0Justin Ho2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "Update spinner assets" into ics-mr0Justin Ho2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am 0c7020dd: Merge "Update scrubber assets" into ics-mr0Justin Ho2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "Update scrubber assets" into ics-mr0Justin Ho2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am d864a503: Merge "Update rating stars" into ics-mr0Justin Ho2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "Update rating stars" into ics-mr0Justin Ho2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am 488eddca: Merge "Update lockscreen assets" into ics-mr0Justin Ho2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "Update lockscreen assets" into ics-mr0Justin Ho2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am e93f09d6: Merge "Update lockscreen assets" into ics-mr0Justin Ho2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "Update lockscreen assets" into ics-mr0Justin Ho2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am 2076de1b: Merge "Update fastscroll assets" into ics-mr0Justin Ho2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "Update fastscroll assets" into ics-mr0Justin Ho2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am 8ffa1371: Merge "Update checkboxes" into ics-mr0Justin Ho2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "Update checkboxes" into ics-mr0Justin Ho2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am 68bb87b9: Merge "Update stars" into ics-mr0Justin Ho2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "Update stars" into ics-mr0Justin Ho2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge "Return early when we cannot allocate a hardware layer Bug #5462308"Romain Guy2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | am 3877089c: Merge "Update Settings Storage app icon" into ics-mr0Justin Ho2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "Update Settings Storage app icon" into ics-mr0Justin Ho2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | am 5f94580c: Merge "Update default app icon" into ics-mr0Justin Ho2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "Update default app icon" into ics-mr0Justin Ho2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am ffaab837: Merge "docs: adt and tools filesizes and md5sums" into ics-mr0Robert Ly2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "docs: adt and tools filesizes and md5sums" into ics-mr0Robert Ly2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | am 9a0732af: Merge "SensorManager reconnects to sensor service when the later...Mathias Agopian2011-10-172-34/+95
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "SensorManager reconnects to sensor service when the later dies" into i...Mathias Agopian2011-10-172-34/+95
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | SensorManager reconnects to sensor service when the later diesMathias Agopian2011-10-162-34/+95
* | | | | | | | | | | | | | | | | | | | am 31603aac: Merge "Validate commands and arguments." into ics-mr0Jeff Sharkey2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "Validate commands and arguments." into ics-mr0Jeff Sharkey2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | am 5d199737: Merge "Fix stupid bug breaking touch on devices without a nav ba...Dianne Hackborn2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "Fix stupid bug breaking touch on devices without a nav bar." into ics-mr0Dianne Hackborn2011-10-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "docs: nfc updates"Robert Ly2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \