summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 50c04abe: Merge "Add Monkey protection" into ics-mr1Michael Kolb2011-11-091-1/+3
|\
| * Merge "Add Monkey protection" into ics-mr1Michael Kolb2011-11-081-1/+3
| |\
| | * Add Monkey protectionMichael Kolb2011-11-071-1/+3
* | | am e7c44c28: Merge "Add support to minimize the WebView\'s memory consumption...Teng-Hui Zhu2011-11-072-0/+8
|\ \ \ | |/ /
| * | Merge "Add support to minimize the WebView's memory consumption by default" i...Teng-Hui Zhu2011-11-072-0/+8
| |\ \
| | * | Add support to minimize the WebView's memory consumption by defaultTeng-Hui Zhu2011-11-072-0/+8
* | | | am 5f25258f: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-070-0/+0
|\ \ \ \ | |/ / /
| * | | Import revised translations. DO NOT MERGEEric Fischer2011-11-0728-57/+30
| | |/ | |/|
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-040-0/+0
|\ \ \
| * \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-020-0/+0
| |\ \ \
| | * \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-010-0/+0
| | |\ \ \
| | | * \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-300-0/+0
| | | |\ \ \
| | | | * \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-270-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-260-0/+0
| | | | | |\ \ \
| | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-230-0/+0
| | | | | | |\ \ \
| | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-190-0/+0
| | | | | | | |\ \ \
| | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-180-0/+0
| | | | | | | | |\ \ \
| | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-160-0/+0
| | | | | | | | | |\ \ \
| | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-130-0/+0
| | | | | | | | | | |\ \ \
| | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-120-0/+0
| | | | | | | | | | | |\ \ \
| | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-110-0/+0
| | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-100-0/+0
| | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-090-0/+0
| | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-060-0/+0
| | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-050-0/+0
| | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-040-0/+0
| | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-030-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-300-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | * | | Fix Resources.getIdentifier usageJohn Reck2011-09-223-3/+9
| | | | | | | | | | | | | | | | | | | | | | | * | | merge in ics-release history after reset to masterThe Android Automerger2011-09-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-180-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-150-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | Unregister the NFC callback onPause.Ben Murdoch2011-09-022-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | merge in ics-release history after reset to masterThe Android Automerger2011-09-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / /