summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add use of net.tethering.noprovisioning to fetchDunApn"Wink Saville2012-01-060-0/+0
|\
* \ am 20090b30: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-060-0/+0
|\ \
| * \ Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-060-0/+0
| |\ \
| | * \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-060-0/+0
| | |\ \
* | | \ \ Merge "New UX calls for dialogs without titles."Marco Nelissen2012-01-060-0/+0
|\ \ \ \ \
* \ \ \ \ \ Merge "Update WebSettings.PREVIOUS_VERSION"John Reck2012-01-060-0/+0
|\ \ \ \ \ \
* \ \ \ \ \ \ am 4bc873e6: am 7944704e: Merge "Switch camera sounds to always use the syste...Eino-Ville Talvala2012-01-060-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am 7944704e: Merge "Switch camera sounds to always use the system enforced au...Eino-Ville Talvala2012-01-060-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge "Switch camera sounds to always use the system enforced audio stream." ...Eino-Ville Talvala2012-01-060-0/+0
| | |\ \ \ \ \
* | | \ \ \ \ \ am c2eaee53: (-s ours) am a476eed6: Merge "getDuration can be only called aft...Bart Sears2012-01-060-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am a476eed6: Merge "getDuration can be only called after prepared. DO NOT MER...Bart Sears2012-01-060-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1Bart Sears2012-01-060-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
* | | | | | | | Merge "Don't allow reading of packagelist files."Nick Kralevich2012-01-060-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge "Minor tweak to console output."Dan Morrill2012-01-060-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ am f817e941: am 2f143a96: Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetu...Wink Saville2012-01-060-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | am 2f143a96: Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" in...Wink Saville2012-01-060-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1Wink Saville2012-01-060-0/+0
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ am 42e231bf: (-s ours) am c1d03cff: Merge "Fix bug #5822825 Paint.measureText...Fabrice Di Meglio2012-01-060-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am c1d03cff: Merge "Fix bug #5822825 Paint.measureText (char[] text, int inde...Fabrice Di Meglio2012-01-060-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count)...Fabrice Di Meglio2012-01-060-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
* | | | | | | | | | am bc72272c: am beb8be60: Merge "Fixing crash when taking screenshot over sec...Justin Ho2012-01-060-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am beb8be60: Merge "Fixing crash when taking screenshot over secure window." ...Justin Ho2012-01-060-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Fixing crash when taking screenshot over secure window." into ics-mr1Justin Ho2012-01-060-0/+0
| | |\ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ am 7db47a42: am 3116b7a7: Merge "Updating default image wallpaper for tablet....Justin Ho2012-01-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | am 3116b7a7: Merge "Updating default image wallpaper for tablet." into ics-mr1Justin Ho2012-01-060-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Updating default image wallpaper for tablet." into ics-mr1Justin Ho2012-01-060-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | / / / / / / | | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Merge "Remove GET_NATIVE_VIEW from WebViewCore to reduce JNI."George Mount2012-01-060-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge "Small tweaks to Tile Benchmark test"Guang Zhu2012-01-060-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE"Steve Block2012-01-0635-228/+228
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-0635-228/+228
* | | | | | | | | | Merge "Clean up code using eclipse's automatic cleanup feature."George Mount2012-01-060-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge "Also accept non-parenthesized genre numbers"Marco Nelissen2012-01-060-0/+0
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge "Make WebView.HitTestResult static"Jonathan Dixon2012-01-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge "Comment clean up for InputMethodSubtype."Ken Wakasa2012-01-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge "Bug fix for android.animation.LayoutTransition getStartDelay (int tran...Rajdeep Dua2012-01-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge "Fix bug #5753006 Garbled Labels in Maps"Fabrice Di Meglio2012-01-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge "getDuration can be only called after prepared."Teng-Hui Zhu2012-01-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "BandwidthTestRunner"David Hu2012-01-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "ThumbnailUtils: To fix misuse of FileInputStream."Marco Nelissen2012-01-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"Steve Block2012-01-0522-96/+96
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-0422-96/+96
* | | | | | | | | | | | | | | Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count)...Fabrice Di Meglio2012-01-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | am 47228cac: am dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1Scott Main2012-01-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | am dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1Scott Main2012-01-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge changes I1df85b6a,I7c6a68b6 into ics-mr1Scott Main2012-01-050-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | am d32ee5ba: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Filter our v6 address from tethering dns."Robert Greenwalt2012-01-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Remove the notion of "active track" from mixer"Glenn Kasten2012-01-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
generated by cgit v1.1 at 2025-01-10 23:51:40 +0000