summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." int...Wink Saville2011-04-113-255/+230
|\
| * Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTEWink Saville2011-04-113-255/+230
| |\
| | * Move ProcessedMessage into HierarchicalStateMachine.Wink Saville2011-04-113-255/+230
* | | am b7e8a54d: Merge "Add prepaid data services URL to Secure Settings" into ho...Freeman Ng2011-04-111-0/+7
|\ \ \ | |/ /
| * | Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTEFreeman Ng2011-04-111-0/+7
| |\ \ | | |/ | |/|
| | * Add prepaid data services URL to Secure SettingsFreeman Ng2011-04-071-0/+7
* | | am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java counterpart...Nicolas Roard2011-04-071-1/+0
|\ \ \ | |/ /
| * | am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix f...Nicolas Roard2011-04-071-1/+0
| |\ \
| | * \ Merge "Remove uncalled function -- java counterpart of the fix for bug:418380...Nicolas Roard2011-04-071-1/+0
| | |\ \
| | | * | Remove uncalled function -- java counterpart ofNicolas Roard2011-04-071-1/+0
* | | | | am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1Teng-Hui Zhu2011-04-073-5/+60
|\ \ \ \ \ | |/ / / /
| * | | | am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1Teng-Hui Zhu2011-04-073-5/+60
| |\ \ \ \ | | |/ / /
| | * | | DO NOT MERGE : cherry pick of change Ieb7ae26b from masterTeng-Hui Zhu2011-04-073-9/+34
| | * | | DO NOT MERGE : cherry pick of change I0f9f2c65 from masterTeng-Hui Zhu2011-04-072-3/+33
* | | | | resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aospRobert Greenwalt2011-04-078-0/+124
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add external dependency API." into honeycomb-LTERobert Greenwalt2011-04-078-0/+124
| |\ \ \ \
| | * | | | Add external dependency API.Robert Greenwalt2011-04-078-0/+124
* | | | | | am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTEJohn Wang2011-04-074-4/+280
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Make LinkProperties comparable." into honeycomb-LTEJohn Wang2011-04-074-4/+280
| |\ \ \ \ \
| | * | | | | Make LinkProperties comparable.John Wang2011-04-074-4/+280
* | | | | | | am b3bb6fd5: am b25181aa: Merge "Fix the issue the video can\'t start to play...Teng-Hui Zhu2011-04-072-9/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeyc...Teng-Hui Zhu2011-04-072-9/+3
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge "Fix the issue the video can't start to play" into honeycomb-mr1Teng-Hui Zhu2011-04-072-9/+3
| | |\ \ \ \ \
| | | * | | | | Fix the issue the video can't start to playTeng-Hui Zhu2011-04-062-9/+3
* | | | | | | | am ad3bddab: am 9f2f650f: Merge "Import revised translations. DO NOT MERGE" ...Eric Fischer2011-04-062-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 9f2f650f: Merge "Import revised translations. DO NOT MERGE" into honeycom...Eric Fischer2011-04-062-4/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-04-062-4/+4
* | | | | | | | am 2bb59637: am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when ...Adam Powell2011-04-051-21/+136
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enab...Adam Powell2011-04-051-21/+136
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | / / / | | |_|_|/ / / | |/| | | | |
| | * | | | | Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into hon...Adam Powell2011-04-051-21/+136
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fix bug 4207704 - Gestures can be lost when Flash is enabledAdam Powell2011-04-041-21/+136
* | | | | | | am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is bein...Jason parks2011-04-042-5/+21
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ am cca2f2f9: Merge "Send out a broadcast that the system is being factory res...Jason parks2011-04-042-5/+21
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge "Send out a broadcast that the system is being factory reset." into gin...Jason parks2011-03-302-5/+21
| | |\ \ \ \ \ \ \
| | | * | | | | | | Send out a broadcast that the system is beingJason parks2011-03-162-5/+21
| | * | | | | | | | Merge "Fix Default route after secondary net use." into gingerbreadRobert Greenwalt2011-03-262-0/+5
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix Default route after secondary net use.Robert Greenwalt2011-03-262-0/+5
* | | | | | | | | | | am 27e00544: am 9907d161: Merge "Fix data corruption when writing to Bluetoot...Brad Fitzpatrick2011-04-041-7/+13
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket"Brad Fitzpatrick2011-04-041-7/+13
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge "Fix data corruption when writing to Bluetooth socket"Brad Fitzpatrick2011-04-041-7/+13
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix data corruption when writing to Bluetooth socketMike Playle2011-04-041-7/+13
* | | | | | | | | | | | | am 9b1b6439: am 2ed72048: Merge "Always return a valid index from Rfc822Token...Brad Fitzpatrick2011-04-042-2/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findToke...Brad Fitzpatrick2011-04-042-2/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"Brad Fitzpatrick2011-04-042-2/+19
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Always return a valid index from Rfc822Tokenizer.findTokenEnd()Mattias Niklewski2011-04-042-2/+19
| | | |/ / / / / / / / / /
* | | | | | | | | | | | | am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting c...Brad Fitzpatrick2011-04-041-0/+131
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am e558a000: Merge "Avoid crash in system server when mounting container"Brad Fitzpatrick2011-04-041-0/+131
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Avoid crash in system server when mounting containerFredrik Helmer2011-04-041-0/+131
| | |/ / / / / / / / / /
| * | | | | | | | | | | Fix bad merge.Robert Greenwalt2011-04-012-0/+5
* | | | | | | | | | | | am 6f7e4cb5: am 3f39f653: Adding package description for android.hardware.usbRobert Ly2011-04-041-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |