Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | am 2720cfae: Merge "Fix 5433466 - FU out of position during orientation chang... | Brian Colonna | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | Merge "Fix 5433466 - FU out of position during orientation change" into ics-mr0 | Brian Colonna | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | am ee5aa0e8: (-s ours) Merge "DO NOT MERGE. Updating screenshot notification... | Winson Chung | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | Merge "DO NOT MERGE. Updating screenshot notification strings. (Bug: 5333706... | Winson Chung | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | am 9beac371: Merge "Fixing issue where screenshot intent to file path did not... | Winson Chung | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | Merge "Fixing issue where screenshot intent to file path did not show other s... | Winson Chung | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | am f13313a0: Merge "Fix 5452698: fix broken logic in reportFailedAttempt() in... | Jim Miller | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | / / / / / / / / / | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge "Fix 5452698: fix broken logic in reportFailedAttempt() in lockscreen" ... | Jim Miller | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | am 3f70aa78: Merge "docs: Camera JavaDoc - added xref to Camera DevGuide" int... | Joe Fernandez | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge "docs: Camera JavaDoc - added xref to Camera DevGuide" into ics-mr0 | Joe Fernandez | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 6d076a42: Merge "fix bug where the instance saving of the ChooseTypeAndAcc... | Fred Quintana | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge "fix bug where the instance saving of the ChooseTypeAndAccountActivity ... | Fred Quintana | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | am 535f6eac: Merge "Fix issue #5461497: Landed on Welcome screen after a tap ... | Dianne Hackborn | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge "Fix issue #5461497: Landed on Welcome screen after a tap on 'Next' in ... | Dianne Hackborn | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Update comment on required fields for an event" | Michael Chan | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am dd466152: Merge "Initialize Hipri correctly." into ics-mr0 | Robert Greenwalt | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | Merge "Initialize Hipri correctly." into ics-mr0 | Robert Greenwalt | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | / / / / / / / / / / / | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | am 87bc53de: Merge "Make notification panel delete-all animation smoother" in... | Chet Haase | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge "Make notification panel delete-all animation smoother" into ics-mr0 | Chet Haase | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | / / / / | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | am 07848843: Merge "Add DataConnection#isEmergency and use in trySetupData." ... | Wink Saville | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | / / / / / / / | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge "Add DataConnection#isEmergency and use in trySetupData." into ics-mr0 | Wink Saville | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | am 8e6d75af: Merge "Fix 5473038: workaround for fd leak in lockscreen" into i... | Jim Miller | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge "Fix 5473038: workaround for fd leak in lockscreen" into ics-mr0 | Jim Miller | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | / / / / / / / / / | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | am f522e095: Merge "Add wrapper method to GsmAlphabet for API compatibility."... | Jake Hamby | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge "Add wrapper method to GsmAlphabet for API compatibility." into ics-mr0 | Jake Hamby | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | am 601d5817: Merge "TouchExplorer crashes if there is incative pointer while ... | Svetoslav Ganov | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge "TouchExplorer crashes if there is incative pointer while dragging." in... | Svetoslav Ganov | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | am 6d9d17fd: Merge "Visual changes to recent apps" into ics-mr0 | Michael Jurka | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge "Visual changes to recent apps" into ics-mr0 | Michael Jurka | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | am d6462ab5: Merge "docs: fix mistakes" into ics-mr0 | Robert Ly | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge "docs: fix mistakes" into ics-mr0 | Robert Ly | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | am 3c44e8d2: (-s ours) Merge "Import revised translations. DO NOT MERGE" int... | Eric Fischer | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr0 | Eric Fischer | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | am 5310a731: Merge "Updating screenshot animation and behaviour. (Bug: 533370... | Winson Chung | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge "Updating screenshot animation and behaviour. (Bug: 5333706)" into ics-mr0 | Winson Chung | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | / / / / / / / / | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | | am 1ff39212: Merge "cherrypick from master - docs: nfc updates Change-Id: Iaa... | Robert Ly | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Merge "cherrypick from master - docs: nfc updates Change-Id: Iaa782911f14b11b... | Robert Ly | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Update to hidden APIs" | RoboErik | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 2bd3c2f7: Merge "Fix null ptr exception in getReadingLevelScale()" into ic... | Mangesh Ghiware | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge "Fix null ptr exception in getReadingLevelScale()" into ics-mr0 | Mangesh Ghiware | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am dba69061: Merge "Send availability info more reliably" into ics-mr0 | Robert Greenwalt | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge "Send availability info more reliably" into ics-mr0 | Robert Greenwalt | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a548b5cb: Merge "Removing Testudo and adding Themos ringtone Bug: 5416299"... | Justin Ho | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | Merge "Removing Testudo and adding Themos ringtone Bug: 5416299" into ics-mr0 | Justin Ho | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am b7ad8253: Merge "Add documents for the spell checker framework and the inp... | satok | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | Merge "Add documents for the spell checker framework and the input method sub... | satok | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | / / / / / / / / | | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Reconcile with ics-mr0-release | The Android Open Source Project | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-17 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 11116b80: Merge "Disconnect without CTRL-EVENT-DISCONNECTED" into ics-mr0 | Irfan Sheriff | 2011-10-17 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |