summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am d592714d: am 15fe377c: Merge "Bluetooth HDP sample." into ics-mr1Fred Chung2011-11-172-0/+10
|\
| * am 15fe377c: Merge "Bluetooth HDP sample." into ics-mr1Fred Chung2011-11-162-0/+10
| |\
| | * Merge "Bluetooth HDP sample." into ics-mr1Fred Chung2011-11-162-0/+10
| | |\
| | | * Bluetooth HDP sample.Fred Chung2011-11-142-0/+10
* | | | am 4dce941e: am 816e68e2: No-op merge from ics-mr0The Android Open Source Project2011-11-170-0/+0
|\ \ \ \ | |/ / /
| * | | am 816e68e2: No-op merge from ics-mr0The Android Open Source Project2011-11-160-0/+0
| |\ \ \ | | |/ /
| | * | No-op merge from ics-mr0The Android Open Source Project2011-11-160-0/+0
| | |\ \
| | | * \ Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| | | |\ \
* | | | \ \ Merge "Not showing facelock when plugging/unplugging fixes 5438524"Steven Ross2011-11-161-3/+15
|\ \ \ \ \ \
| * | | | | | Not showing facelock when plugging/unplugging fixes 5438524Steven Ross2011-11-161-3/+15
* | | | | | | Merge "Bug 4903178 Restore priority and cgroup on stop"Glenn Kasten2011-11-164-12/+28
|\ \ \ \ \ \ \
| * | | | | | | Bug 4903178 Restore priority and cgroup on stopGlenn Kasten2011-11-164-12/+28
* | | | | | | | Merge "When in the Choose Account flow if the accounts list display was initi...Fred Quintana2011-11-161-1/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | When in the Choose Account flow if the accounts list display was initiallyFred Quintana2011-11-151-1/+15
* | | | | | | | Merge "Expand RS vector3 types to vector4."Alex Sakhartchouk2011-11-169-24/+176
|\ \ \ \ \ \ \ \
| * | | | | | | | Expand RS vector3 types to vector4.Alex Sakhartchouk2011-11-159-24/+176
* | | | | | | | | am c172688d: (-s ours) am c7403258: Reconcile with ics-mr0-release ics-factor...The Android Open Source Project2011-11-160-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | am c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | | | | | | |
| | | \ \ \ \ \ \
| | *-. \ \ \ \ \ \ Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | |
| | | | * | | | | | Fix bug in TextLayoutCacheKey handling embedded nulls.Jeff Brown2011-11-111-1/+1
| | | * | | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-150-0/+0
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | | * | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-140-0/+0
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-130-0/+0
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open anAdam Powell2011-11-112-2/+7
| | | | | | * | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-110-0/+0
| | | | | | |\ \ \ \ \ \
* | | | | | | \ \ \ \ \ \ Merge changes I2c304952,Ic04bbd69,Ibbac2268Steve Block2011-11-162-15/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update Java Bridge test for coercing JavaScript String to Java char in an arraySteve Block2011-11-161-2/+2
| * | | | | | | | | | | | | Add tests for multidimensional arrays in WebView's Java BridgeSteve Block2011-11-161-0/+31
| * | | | | | | | | | | | | Fix tests for methods returning arrays in WebView's Java BridgeSteve Block2011-11-161-15/+14
* | | | | | | | | | | | | | Merge "Add tests for invalid and static methods in the WebView's Java Bridge"Steve Block2011-11-161-14/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add tests for invalid and static methods in the WebView's Java BridgeSteve Block2011-11-141-14/+41
* | | | | | | | | | | | | am 0f2dec50: am bd783684: am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7...Jake Hamby2011-11-153-11/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am bd783684: am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national...Jake Hamby2011-11-153-11/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tab...Jake Hamby2011-11-153-11/+52
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ic...Jake Hamby2011-11-153-11/+52
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Fix 3GPP SMS send failure for 7-bit national language tables.Jake Hamby2011-11-143-11/+52
| | | | | |/ / / / / / / / | | | | |/| | | | | | | |
* | | | | | | | | | | | | am df1aba0a: am c7b35481: am c3cf16d2: Merge "IAB Doc Fix: Error in code snip...Bill Gruber2011-11-151-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am c7b35481: am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 52217...Bill Gruber2011-11-151-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0Bill Gruber2011-11-151-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0Bill Gruber2011-11-151-5/+5
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | IAB Doc Fix: Error in code snippetBill Gruber2011-11-151-5/+5
| | | | |/ / / / / / / / /
* | | | | | | | | | | | | am 7456cf0a: am cbc96549: am 0fd69ff4: Merge "Adding new "Security Best Pract...Adrian Ludwig2011-11-152-0/+776
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am cbc96549: am 0fd69ff4: Merge "Adding new "Security Best Practices" to the ...Adrian Ludwig2011-11-152-0/+776
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." i...Adrian Ludwig2011-11-152-0/+776
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0Adrian Ludwig2011-11-152-0/+776
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Adding new "Security Best Practices" to the html docs.Adrian Ludwig2011-11-082-0/+776
* | | | | | | | | | | | | am 4e72e2bf: am 4fdc36e6: Merge "Document that release() should be called wit...James Dong2011-11-152-9/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 4fdc36e6: Merge "Document that release() should be called with onPause() a...James Dong2011-11-152-9/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "Document that release() should be called with onPause() and onStop() f...James Dong2011-11-152-9/+28
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Document that release() should be called with onPause() and onStop() for medi...James Dong2011-11-152-9/+28