Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | am d592714d: am 15fe377c: Merge "Bluetooth HDP sample." into ics-mr1 | Fred Chung | 2011-11-17 | 2 | -0/+10 | |
|\ | ||||||
| * | am 15fe377c: Merge "Bluetooth HDP sample." into ics-mr1 | Fred Chung | 2011-11-16 | 2 | -0/+10 | |
| |\ | ||||||
| | * | Merge "Bluetooth HDP sample." into ics-mr1 | Fred Chung | 2011-11-16 | 2 | -0/+10 | |
| | |\ | ||||||
| | | * | Bluetooth HDP sample. | Fred Chung | 2011-11-14 | 2 | -0/+10 | |
* | | | | am 4dce941e: am 816e68e2: No-op merge from ics-mr0 | The Android Open Source Project | 2011-11-17 | 0 | -0/+0 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | am 816e68e2: No-op merge from ics-mr0 | The Android Open Source Project | 2011-11-16 | 0 | -0/+0 | |
| |\ \ \ | | |/ / | ||||||
| | * | | No-op merge from ics-mr0 | The Android Open Source Project | 2011-11-16 | 0 | -0/+0 | |
| | |\ \ | ||||||
| | | * \ | Reconcile with ics-factoryrom-2-release | The Android Open Source Project | 2011-11-16 | 0 | -0/+0 | |
| | | |\ \ | ||||||
* | | | \ \ | Merge "Not showing facelock when plugging/unplugging fixes 5438524" | Steven Ross | 2011-11-16 | 1 | -3/+15 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Not showing facelock when plugging/unplugging fixes 5438524 | Steven Ross | 2011-11-16 | 1 | -3/+15 | |
* | | | | | | | Merge "Bug 4903178 Restore priority and cgroup on stop" | Glenn Kasten | 2011-11-16 | 4 | -12/+28 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Bug 4903178 Restore priority and cgroup on stop | Glenn Kasten | 2011-11-16 | 4 | -12/+28 | |
* | | | | | | | | Merge "When in the Choose Account flow if the accounts list display was initi... | Fred Quintana | 2011-11-16 | 1 | -1/+15 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | When in the Choose Account flow if the accounts list display was initially | Fred Quintana | 2011-11-15 | 1 | -1/+15 | |
* | | | | | | | | Merge "Expand RS vector3 types to vector4." | Alex Sakhartchouk | 2011-11-16 | 9 | -24/+176 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Expand RS vector3 types to vector4. | Alex Sakhartchouk | 2011-11-15 | 9 | -24/+176 | |
* | | | | | | | | | am c172688d: (-s ours) am c7403258: Reconcile with ics-mr0-release ics-factor... | The Android Open Source Project | 2011-11-16 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | am c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release | The Android Open Source Project | 2011-11-16 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | ||||||
| | | | | | | | | | ||||||
| | | \ \ \ \ \ \ | ||||||
| | *-. \ \ \ \ \ \ | Reconcile with ics-mr0-release ics-factoryrom-2-release | The Android Open Source Project | 2011-11-16 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | | | ||||||
| | | | * | | | | | | Fix bug in TextLayoutCacheKey handling embedded nulls. | Jeff Brown | 2011-11-11 | 1 | -1/+1 | |
| | | * | | | | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-11-15 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | | | ||||||
| | | | * | | | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-11-14 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ | ||||||
| | | | | * \ \ \ \ \ | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-11-13 | 0 | -0/+0 | |
| | | | | |\ \ \ \ \ \ | ||||||
| | | | | | * | | | | | | DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an | Adam Powell | 2011-11-11 | 2 | -2/+7 | |
| | | | | | * | | | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-11-11 | 0 | -0/+0 | |
| | | | | | |\ \ \ \ \ \ | ||||||
* | | | | | | \ \ \ \ \ \ | Merge changes I2c304952,Ic04bbd69,Ibbac2268 | Steve Block | 2011-11-16 | 2 | -15/+45 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Update Java Bridge test for coercing JavaScript String to Java char in an array | Steve Block | 2011-11-16 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | Add tests for multidimensional arrays in WebView's Java Bridge | Steve Block | 2011-11-16 | 1 | -0/+31 | |
| * | | | | | | | | | | | | | Fix tests for methods returning arrays in WebView's Java Bridge | Steve Block | 2011-11-16 | 1 | -15/+14 | |
* | | | | | | | | | | | | | | Merge "Add tests for invalid and static methods in the WebView's Java Bridge" | Steve Block | 2011-11-16 | 1 | -14/+41 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Add tests for invalid and static methods in the WebView's Java Bridge | Steve Block | 2011-11-14 | 1 | -14/+41 | |
* | | | | | | | | | | | | | am 0f2dec50: am bd783684: am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7... | Jake Hamby | 2011-11-15 | 3 | -11/+52 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | am bd783684: am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national... | Jake Hamby | 2011-11-15 | 3 | -11/+52 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tab... | Jake Hamby | 2011-11-15 | 3 | -11/+52 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | | Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ic... | Jake Hamby | 2011-11-15 | 3 | -11/+52 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | Fix 3GPP SMS send failure for 7-bit national language tables. | Jake Hamby | 2011-11-14 | 3 | -11/+52 | |
| | | | | |/ / / / / / / / | | | | |/| | | | | | | | | ||||||
* | | | | | | | | | | | | | am df1aba0a: am c7b35481: am c3cf16d2: Merge "IAB Doc Fix: Error in code snip... | Bill Gruber | 2011-11-15 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | am c7b35481: am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 52217... | Bill Gruber | 2011-11-15 | 1 | -5/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0 | Bill Gruber | 2011-11-15 | 1 | -5/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | ||||||
| | | * | | | | | | | | | | Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0 | Bill Gruber | 2011-11-15 | 1 | -5/+5 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | IAB Doc Fix: Error in code snippet | Bill Gruber | 2011-11-15 | 1 | -5/+5 | |
| | | | |/ / / / / / / / / | ||||||
* | | | | | | | | | | | | | am 7456cf0a: am cbc96549: am 0fd69ff4: Merge "Adding new "Security Best Pract... | Adrian Ludwig | 2011-11-15 | 2 | -0/+776 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | am cbc96549: am 0fd69ff4: Merge "Adding new "Security Best Practices" to the ... | Adrian Ludwig | 2011-11-15 | 2 | -0/+776 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | am 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." i... | Adrian Ludwig | 2011-11-15 | 2 | -0/+776 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | ||||||
| | | * | | | | | | | | | | Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0 | Adrian Ludwig | 2011-11-15 | 2 | -0/+776 | |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | ||||||
| | | | * | | | | | | | | | Adding new "Security Best Practices" to the html docs. | Adrian Ludwig | 2011-11-08 | 2 | -0/+776 | |
* | | | | | | | | | | | | | am 4e72e2bf: am 4fdc36e6: Merge "Document that release() should be called wit... | James Dong | 2011-11-15 | 2 | -9/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | am 4fdc36e6: Merge "Document that release() should be called with onPause() a... | James Dong | 2011-11-15 | 2 | -9/+28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | Merge "Document that release() should be called with onPause() and onStop() f... | James Dong | 2011-11-15 | 2 | -9/+28 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | Document that release() should be called with onPause() and onStop() for medi... | James Dong | 2011-11-15 | 2 | -9/+28 |