summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix missing NLBruce Beare2010-06-251-1/+0
| | | | | Change-Id: I323f0c01d2e9ad4c9f07cad24bf6b63edc28ad62 Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
* am 17ae6465: Merge "Doc change: Fix description of certificate matching ↵Dirk Dougherty2010-06-220-0/+0
|\ | | | | | | | | | | | | | | | | requirement for app updates." into froyo Merge commit '17ae646586663c59ad360bb72884beded7475687' into froyo-plus-aosp * commit '17ae646586663c59ad360bb72884beded7475687': Doc change: Fix description of certificate matching requirement for app updates.
| * Merge "Doc change: Fix description of certificate matching requirement for ↵Dirk Dougherty2010-06-220-0/+0
| | | | | | | | app updates." into froyo
* | am 30cf330f: Import revised translationsKenny Root2010-06-210-0/+0
|\ \ | |/ | | | | | | | | | | Merge commit '30cf330fae137587d51aa4c026459db146705ba9' into froyo-plus-aosp * commit '30cf330fae137587d51aa4c026459db146705ba9': Import revised translations
* | am c4e38577: Import revised translationsKenny Root2010-06-210-0/+0
|\ \ | |/ | | | | | | | | | | Merge commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17' into froyo-plus-aosp * commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17': Import revised translations
* | merge from open-source masterThe Android Open Source Project2010-06-180-0/+0
|\ \ | | | | | | | | | Change-Id: If7ae0c5629d1b3c540cacfa517425c2e6b5822d1
| * \ Merge "Fixing counting the number of days in call log screen."Jean-Baptiste Queru2010-06-150-0/+0
| |\ \
* | \ \ merge from open-source masterThe Android Open Source Project2010-06-180-0/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I05e4c26c902f3cfe0dd99107f518768b246562f7
* | | | merge from open-source masterThe Android Open Source Project2010-06-180-0/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I8e7ccd470e8b90347686985aa2d8337d0c38900c
| * | | Merge "fillWindow's start position must be smaller than getCount value"Romain Guy2010-06-150-0/+0
| |\ \ \
* | \ \ \ merge from open-source masterThe Android Open Source Project2010-06-180-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I17a51b7cebe1486103d4b0af00e7297ddccb60b8
| * | | | Merge "Change in media scanner to set correct date"Romain Guy2010-06-150-0/+0
| |\ \ \ \
* | \ \ \ \ am 57f4503e: Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ↵Dianne Hackborn2010-06-170-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ERE27 in 13hr test Merge commit '57f4503e1a129d6a648f2378d36a060998a577a0' into froyo-plus-aosp * commit '57f4503e1a129d6a648f2378d36a060998a577a0': Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
* | | | | | am 5f11e95f: docs: small edits to catchup to edits made in html pushed liveScott Main2010-06-170-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5f11e95f0041e163e8aa9e429aec92c8ee942233' into froyo-plus-aosp * commit '5f11e95f0041e163e8aa9e429aec92c8ee942233': docs: small edits to catchup to edits made in html pushed live
* | | | | | am 39e876ad: Merge "When filling the cache, we always time out waiting for a ↵James Dong2010-06-170-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo Merge commit '39e876ad743f203fe005333947c61383772b0d14' into froyo-plus-aosp * commit '39e876ad743f203fe005333947c61383772b0d14': When filling the cache, we always time out waiting for a condition that won't occur.
| * | | | | Merge "When filling the cache, we always time out waiting for a condition ↵James Dong2010-06-160-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | that won't occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo
* | \ \ \ \ \ am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free ↵Dave Sparks2010-06-170-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into fro Merge commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b' into froyo-plus-aosp * commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b': TimedEventQueue is apparently important for glitch-free media playback, and so
| * | | | | | Merge "TimedEventQueue is apparently important for glitch-free media ↵Dave Sparks2010-06-160-0/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into froyo
* | | | | | am 821ca518: docs: edits to resources docScott Main2010-06-170-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '821ca51857f4d21b231cd9ead786227b771fe759' into froyo-plus-aosp * commit '821ca51857f4d21b231cd9ead786227b771fe759': docs: edits to resources doc
* | | | | | am bccedb03: docs: update dashboard againScott Main2010-06-170-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'bccedb03fad4e72c1776d2ab9e918fab4d25f222' into froyo-plus-aosp * commit 'bccedb03fad4e72c1776d2ab9e918fab4d25f222': docs: update dashboard again
* | | | | | am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth ↵Dan Morrill2010-06-170-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission. Merge commit '6b22d81aa35d9a9b32670995c002e92588b2fe09' into froyo-plus-aosp * commit '6b22d81aa35d9a9b32670995c002e92588b2fe09': As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
* | | | | | am cdeae439: Merge "docs: update dashboard" into froyoScott Main2010-06-150-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'cdeae439a3637062dc0701654a1cb7874bfd1ae8' into froyo-plus-aosp * commit 'cdeae439a3637062dc0701654a1cb7874bfd1ae8': docs: update dashboard
| * | | | | Merge "docs: update dashboard" into froyoScott Main2010-06-150-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ am 6567adf8: Move android-common to framework/exYing Wang2010-06-1515-1780/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6567adf8b637c36817625cd38d64cd4b8510b097' into froyo-plus-aosp * commit '6567adf8b637c36817625cd38d64cd4b8510b097': Move android-common to framework/ex
| * | | | | | Move android-common to framework/exYing Wang2010-06-1515-1780/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one necessary step by unbundling. Change-Id: I9d922a52374ad6331fa2e39fa4b5e16ad7d108fa
* | | | | | | am 27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyoJoe Onorato2010-06-151-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '27357fc08802d796a6b6a1111ac5534d75fc8be7' into froyo-plus-aosp * commit '27357fc08802d796a6b6a1111ac5534d75fc8be7': Use the droidcore goal with dist-for-goals.
| * | | | | | Merge "Use the droidcore goal with dist-for-goals." into froyoJoe Onorato2010-06-151-1/+1
| |\ \ \ \ \ \
| | * | | | | | Use the droidcore goal with dist-for-goals.Joe Onorato2010-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie0042028c4a33a23a4eb9aed1d1015e580c3e168
* | | | | | | | am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing ↵Joe Onorato2010-06-150-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an apps-only build, so don\'t try to build them." into froyo Merge commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a' into froyo-plus-aosp * commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a': The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
| * | | | | | | Merge "The aapt and aidl tools are prebuilt when we're doing an apps-only ↵Joe Onorato2010-06-150-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | build, so don't try to build them." into froyo
* | | | | | | | merge from open-source masterThe Android Open Source Project2010-06-150-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | Change-Id: Ib9ec3f3b7418d064b643577156d7d16688b3048d
| * | | | | | | Merge "Fix that InputDeviceReaderThread that got killed during startup"Jean-Baptiste Queru2010-06-150-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
* | | | | | | | merge from open-source masterThe Android Open Source Project2010-06-150-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | Change-Id: I0684cac9eb230d864614aef0634c072f4e3ef6a3
* | | | | | | | merge from open-source masterThe Android Open Source Project2010-06-151-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | Change-Id: I12af4b88c1881a6a120031459bc63d87b1dd4956
| * | | | | | | Merge "Use stride for source and target buffers when copybit is enabled."Jean-Baptiste Queru2010-06-151-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Use stride for source and target buffers when copybit is enabled.Mathias Palmqvist2010-06-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie651013b3522f8e004685d74190da86433086307
* | | | | | | | | am 457738e6: Merge "docs: add information about known issues in resource ↵Scott Main2010-06-150-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo Merge commit '457738e628ee4d165014996bcf4e8d1983ac5929' into froyo-plus-aosp * commit '457738e628ee4d165014996bcf4e8d1983ac5929': docs: add information about known issues in resource matching
| * | | | | | | | Merge "docs: add information about known issues in resource matching for ↵Scott Main2010-06-150-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen density and system version. Add section about providing compatibility for multiple devices" into froyo
* | \ \ \ \ \ \ \ \ am 322e7e47: Merge "docs: fix markup error" into froyoScott Main2010-06-150-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '322e7e477d89aca18d65cbd289343e716c45a699' into froyo-plus-aosp * commit '322e7e477d89aca18d65cbd289343e716c45a699': docs: fix markup error
| * | | | | | | | | Merge "docs: fix markup error" into froyoScott Main2010-06-150-0/+0
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | merge from open-source masterThe Android Open Source Project2010-06-150-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | Change-Id: I4d7b0ec9895d8b090e0cdf2efb6731358a5d087c
| * | | | | | | | | Merge "Replaced deprecated String Constructor"Jean-Baptiste Queru2010-06-140-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
* | | | | | | | | | merge from open-source masterThe Android Open Source Project2010-06-150-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I405069e9495e43fdcdedc41efce77d43a291272c
* | | | | | | | | | merge from open-source masterThe Android Open Source Project2010-06-150-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I227bf1b5f1de8f858df72d58a4463aed5cc09cbc
* | | | | | | | | | merge from open-source masterThe Android Open Source Project2010-06-140-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I381f1faaa26a7e52e9882976f32f703fc2aa9c75
| * | | | | | | | | Merge "Fix data type of RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS in RIL."Jean-Baptiste Queru2010-06-140-0/+0
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ merge from open-source masterThe Android Open Source Project2010-06-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia8a5ab84bb9957b4a3daf92a9a21905212867a95
| * | | | | | | | | | Merge "Corrected SPN and PLMN name handling"Jean-Baptiste Queru2010-06-140-0/+0
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ merge from open-source masterThe Android Open Source Project2010-06-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ica77cebdbb8880345faeb1ee819f51b0b7ff7a0c
| * | | | | | | | | | | Merge "replaced deprecated getIntent with parseURI"Jean-Baptiste Queru2010-06-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |