summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge "Fix build."Robert Greenwalt2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | am 60bfa4d0: am 216d9894: am 6bb8b0ec: am afecd1e9: IAB docs--status codes fi...Bill Gruber2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / /
| * | | | | | | | | am 216d9894: am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641Bill Gruber2011-04-070-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641Bill Gruber2011-04-070-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | / / / / | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | am afecd1e9: IAB docs--status codes fix Bug: 4208641Bill Gruber2011-04-070-0/+0
| | | |\ \ \ \ \ \
* | | | \ \ \ \ \ \ am de1b950d: am 9e7a5a1e: Merge "ConnectivityService needs to use the new nam...Wink Saville2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the Ne...Wink Saville2011-04-070-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "ConnectivityService needs to use the new names for the NetConfig vars....Wink Saville2011-04-070-0/+0
| | |\ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ am 4e790ee1: (-s ours) am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf...Teng-Hui Zhu2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1Teng-Hui Zhu2011-04-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1Teng-Hui Zhu2011-04-070-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| / / / / / / / | | | |/ / / / / / /
| | | * | | | | | | Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1Teng-Hui Zhu2011-04-070-0/+0
* | | | | | | | | | am 65ef6e86: (-s ours) am 96ac8560: am 515a08b0: Merge 59aad78e from master. ...Xavier Ducrohet2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 96ac8560: am 515a08b0: Merge 59aad78e from master. do not merge.Xavier Ducrohet2011-04-070-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 515a08b0: Merge 59aad78e from master. do not merge.Xavier Ducrohet2011-04-070-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
* | | | | | | | | | am f4a29403: resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aospRobert Greenwalt2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aospRobert Greenwalt2011-04-070-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Add external dependency API." into honeycomb-LTERobert Greenwalt2011-04-070-0/+0
| | |\ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ Merge "Import revised translations."Eric Fischer2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge "Coalesce input events that arrive faster than 333Hz."Jeff Brown2011-04-071-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Coalesce input events that arrive faster than 333Hz.Jeff Brown2011-04-071-1/+7
* | | | | | | | | | | | | am 91bc0f81: am 574d3c4b: Merge "Refactor onSetupConnectionCompleted." into h...John Wang2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am 574d3c4b: Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTEJohn Wang2011-04-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTEJohn Wang2011-04-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ am c343c183: am 5d6f1167: Merge "Make LinkProperties comparable." into honeyc...John Wang2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTEJohn Wang2011-04-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "Make LinkProperties comparable." into honeycomb-LTEJohn Wang2011-04-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
* | | | | | | | | | | | | Merge "Migrate most GL from context to driver."Jason Sams2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Media JNI code cleanup"James Dong2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge "Do not disable effect in AudioEffect destructor."Eric Laurent2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
* | | | | | | | | | | | | am 7ff3c410: am add31091: Merge "Add a 4G icon for LTE." into honeycomb-LTEWink Saville2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am add31091: Merge "Add a 4G icon for LTE." into honeycomb-LTEWink Saville2011-04-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "Add a 4G icon for LTE." into honeycomb-LTEWink Saville2011-04-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ am d4e8e4bb: am b3bb6fd5: am b25181aa: Merge "Fix the issue the video can\'t ...Teng-Hui Zhu2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | / / / / / / / / / / | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | am b3bb6fd5: am b25181aa: Merge "Fix the issue the video can\'t start to play...Teng-Hui Zhu2011-04-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeyc...Teng-Hui Zhu2011-04-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | / / / / | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "Fix the issue the video can't start to play" into honeycomb-mr1Teng-Hui Zhu2011-04-070-0/+0
| | | |\ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ Merge changes I4011db5c,I622bc5faJoe Onorato2011-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ am 004da7e2: am 1b87f1db: Merge "Add getCdmaSubscriptionSource to CommandsInt...Wink Saville2011-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am 1b87f1db: Merge "Add getCdmaSubscriptionSource to CommandsInterface." into...Wink Saville2011-04-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTEWink Saville2011-04-060-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ am 2059bdf3: am e2b81c3e: am b17cc8a8: Merge "Add moov/mdat and 500KB max A/V...Roman Nurik2011-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am e2b81c3e: am b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recomm...Roman Nurik2011-04-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recommendations to ...Roman Nurik2011-04-060-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Med...Roman Nurik2011-04-060-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ \ \ Merge "Allow batching samples onto the pending motion event."Jeff Brown2011-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Word suggestion popup added to EditText."Gilles Debunne2011-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "invalidate WebView after Title change"Michael Kolb2011-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Minor Alt-TAB / Recent Apps Dialog improvements."Jeff Brown2011-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "Check if BT is disabled or not when sending audio state."Jaikumar Ganesh2011-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \