summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | am 2720cfae: Merge "Fix 5433466 - FU out of position during orientation chang...Brian Colonna2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge "Fix 5433466 - FU out of position during orientation change" into ics-mr0Brian Colonna2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | am ee5aa0e8: (-s ours) Merge "DO NOT MERGE. Updating screenshot notification...Winson Chung2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge "DO NOT MERGE. Updating screenshot notification strings. (Bug: 5333706...Winson Chung2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | am 9beac371: Merge "Fixing issue where screenshot intent to file path did not...Winson Chung2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge "Fixing issue where screenshot intent to file path did not show other s...Winson Chung2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | am f13313a0: Merge "Fix 5452698: fix broken logic in reportFailedAttempt() in...Jim Miller2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | / / / / / / / / / | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "Fix 5452698: fix broken logic in reportFailedAttempt() in lockscreen" ...Jim Miller2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | am 3f70aa78: Merge "docs: Camera JavaDoc - added xref to Camera DevGuide" int...Joe Fernandez2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "docs: Camera JavaDoc - added xref to Camera DevGuide" into ics-mr0Joe Fernandez2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6d076a42: Merge "fix bug where the instance saving of the ChooseTypeAndAcc...Fred Quintana2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "fix bug where the instance saving of the ChooseTypeAndAccountActivity ...Fred Quintana2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | am 535f6eac: Merge "Fix issue #5461497: Landed on Welcome screen after a tap ...Dianne Hackborn2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "Fix issue #5461497: Landed on Welcome screen after a tap on 'Next' in ...Dianne Hackborn2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Update comment on required fields for an event"Michael Chan2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am dd466152: Merge "Initialize Hipri correctly." into ics-mr0Robert Greenwalt2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge "Initialize Hipri correctly." into ics-mr0Robert Greenwalt2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | / / / / / / / / / / / | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | am 87bc53de: Merge "Make notification panel delete-all animation smoother" in...Chet Haase2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "Make notification panel delete-all animation smoother" into ics-mr0Chet Haase2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | / / / / | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | am 07848843: Merge "Add DataConnection#isEmergency and use in trySetupData." ...Wink Saville2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | / / / / / / / | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Add DataConnection#isEmergency and use in trySetupData." into ics-mr0Wink Saville2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ am 8e6d75af: Merge "Fix 5473038: workaround for fd leak in lockscreen" into i...Jim Miller2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "Fix 5473038: workaround for fd leak in lockscreen" into ics-mr0Jim Miller2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | / / / / / / / / / | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | am f522e095: Merge "Add wrapper method to GsmAlphabet for API compatibility."...Jake Hamby2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Add wrapper method to GsmAlphabet for API compatibility." into ics-mr0Jake Hamby2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | am 601d5817: Merge "TouchExplorer crashes if there is incative pointer while ...Svetoslav Ganov2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "TouchExplorer crashes if there is incative pointer while dragging." in...Svetoslav Ganov2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | am 6d9d17fd: Merge "Visual changes to recent apps" into ics-mr0Michael Jurka2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Visual changes to recent apps" into ics-mr0Michael Jurka2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | am d6462ab5: Merge "docs: fix mistakes" into ics-mr0Robert Ly2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "docs: fix mistakes" into ics-mr0Robert Ly2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | am 3c44e8d2: (-s ours) Merge "Import revised translations. DO NOT MERGE" int...Eric Fischer2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr0Eric Fischer2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | am 5310a731: Merge "Updating screenshot animation and behaviour. (Bug: 533370...Winson Chung2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Updating screenshot animation and behaviour. (Bug: 5333706)" into ics-mr0Winson Chung2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | / / / / / / / / | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | am 1ff39212: Merge "cherrypick from master - docs: nfc updates Change-Id: Iaa...Robert Ly2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "cherrypick from master - docs: nfc updates Change-Id: Iaa782911f14b11b...Robert Ly2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge "Update to hidden APIs"RoboErik2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2bd3c2f7: Merge "Fix null ptr exception in getReadingLevelScale()" into ic...Mangesh Ghiware2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Fix null ptr exception in getReadingLevelScale()" into ics-mr0Mangesh Ghiware2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ am dba69061: Merge "Send availability info more reliably" into ics-mr0Robert Greenwalt2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "Send availability info more reliably" into ics-mr0Robert Greenwalt2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a548b5cb: Merge "Removing Testudo and adding Themos ringtone Bug: 5416299"...Justin Ho2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge "Removing Testudo and adding Themos ringtone Bug: 5416299" into ics-mr0Justin Ho2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b7ad8253: Merge "Add documents for the spell checker framework and the inp...satok2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge "Add documents for the spell checker framework and the input method sub...satok2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | / / / / / / / / | | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 11116b80: Merge "Disconnect without CTRL-EVENT-DISCONNECTED" into ics-mr0Irfan Sheriff2011-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /