summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-06-20Import revised translationsandroid-sdk-tools_r7android-cts-2.2_r8android-cts-2.2_r7android-cts-2.2_r6android-cts-2.2_r5android-cts-2.2_r4android-cts-2.2_r3android-cts-2.2_r2android-cts-2.2_r1android-adt-0.9.9android-adt-0.9.8tools_r9tools_r8tools_r7froyo-plus-aospfroyoKenny Root
Change-Id: I594e950bb45499c0a51f03697bbf7585cc376e66
2010-04-27Import revised translationsandroid-sdk-tools_r6android-sdk-2.2_r2android-sdk-2.2_r1android-2.2_r1.3android-2.2_r1.2android-2.2_r1.1android-2.2_r1android-2.2.3_r2.1android-2.2.3_r2android-2.2.3_r1android-2.2.2_r1android-2.2.1_r2android-2.2.1_r1froyo-releaseKenny Root
Change-Id: Ibb2efd5367a777aba40200e02b4efa9df6b0bc56
2010-03-30Import revised translationsKenny Root
Change-Id: I1ec1dc293bec8207e9779a54058e62642fe5d01f
2010-03-17Import revised translationsKenny Root
Change-Id: I4c3d0371c275e232ea73db3de14e6d31e6efa89d
2010-03-08Merge "Allow content of type */* in SoundRecorder, and use 3GPP as the ↵Gloria Wang
default format. Fix for bug 2370421."
2010-03-08Add an empty CleanSpec.mkJean-Baptiste Queru
Change-Id: I1943f4e86850603f429c8b28c793e7443544ca51
2010-03-05Allow content of type */* in SoundRecorder, and use 3GPP as the default format.Gloria Wang
Fix for bug 2370421.
2010-02-11Add an original-package tag that matches the real package name.Jeff Hamilton
Change-Id: Iff66ac9e9bd088419a4cc1f0a9e4126422c4fe8e
2010-02-05am a73007b8: am 27597fb8: reconcile main tree with open-source eclairThe Android Open Source Project
Merge commit 'a73007b8569509b8c3908a8301332a53cf44f151' * commit 'a73007b8569509b8c3908a8301332a53cf44f151': android-2.1_r1 snapshot
2010-02-05am 27597fb8: reconcile main tree with open-source eclairThe Android Open Source Project
Merge commit '27597fb8f979a41c7ff2bcd98eea4ba8cc4e6d26' into eclair-plus-aosp * commit '27597fb8f979a41c7ff2bcd98eea4ba8cc4e6d26': android-2.1_r1 snapshot
2010-02-05reconcile main tree with open-source eclairandroid-sdk-tools_r5android-cts-2.1_r5android-cts-2.1_r4android-cts-2.1_r3android-cts-2.1_r2eclairThe Android Open Source Project
2010-01-29reconcile android-2.1_r1 snapshotThe Android Open Source Project
2010-01-12android-2.1_r1 snapshotThe Android Open Source Project
2010-01-08Deprecate fill_parent and introduce match_parent.Romain Guy
Bug: #2361749.
2010-01-07Update with latest translations.Eric Fischer
2010-01-05explicit set an "optional" tagJean-Baptiste Queru
2009-12-15Merge commit 'goog/eclair-plus-aosp'Android Git Automerger
2009-12-01am 59144c58: (-s ours) am 8741194c: am 6fe9b86e: (-s ours) Import revised ↵Eric Fischer
translations. DO NOT MERGE Merge commit '59144c583dd0a5e7fa496aed9bfb525737b613d1' * commit '59144c583dd0a5e7fa496aed9bfb525737b613d1': Import revised translations. DO NOT MERGE
2009-12-01am 8741194c: am 6fe9b86e: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
Merge commit '8741194c7fa836ef153d6afee0cee3f66e0a15c7' into eclair-mr2-plus-aosp * commit '8741194c7fa836ef153d6afee0cee3f66e0a15c7': Import revised translations. DO NOT MERGE
2009-12-01am 6fe9b86e: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
Merge commit '6fe9b86eb14c79939f60d0ae05ea21ec2592c84d' into eclair-mr2 * commit '6fe9b86eb14c79939f60d0ae05ea21ec2592c84d': Import revised translations. DO NOT MERGE
2009-11-30am 6fe9b86e: Import revised translations. DO NOT MERGEEric Fischer
Merge commit '6fe9b86eb14c79939f60d0ae05ea21ec2592c84d' into eclair-plus-aosp * commit '6fe9b86eb14c79939f60d0ae05ea21ec2592c84d': Import revised translations. DO NOT MERGE
2009-11-30Import revised translations. DO NOT MERGEandroid-sdk-2.1_r1android-2.1_r2.1sandroid-2.1_r2.1p2android-2.1_r2.1pandroid-2.1_r2android-2.1_r1eclair-sholes-release2eclair-releaseeclair-passion-releaseEric Fischer
2009-11-15am b68f6d6c: merge from open-source masterJean-Baptiste Queru
Merge commit 'b68f6d6cf0ce3a54e94dabc5834c5ce42dcd5c7f' * commit 'b68f6d6cf0ce3a54e94dabc5834c5ce42dcd5c7f': eclair snapshot
2009-11-15merge from open-source masterJean-Baptiste Queru
2009-11-15merge from open-source masterJean-Baptiste Queru
Merge commit 'goog/stage-korg-master' into HEAD
2009-11-15merge from eclairJean-Baptiste Queru
2009-11-13am 7fff32a7: (-s ours) am eb861972: (-s ours) Import revised translations. ↵Eric Fischer
DO NOT MERGE Merge commit '7fff32a7792fe3e5fde38cbba8865c3cb2f5344b' * commit '7fff32a7792fe3e5fde38cbba8865c3cb2f5344b': Import revised translations. DO NOT MERGE
2009-11-13am eb861972: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
Merge commit 'eb861972b627bb8eef63d97b977e3bfb728d1e70' into eclair-mr2 * commit 'eb861972b627bb8eef63d97b977e3bfb728d1e70': Import revised translations. DO NOT MERGE
2009-11-13Import revised translations. DO NOT MERGEandroid-sdk-2.0.1_r1android-sdk-2.0.1-docs_r1android-2.0.1_r1eclair-sholes-releaseEric Fischer
Approver: jerryw
2009-11-12eclair snapshotJean-Baptiste Queru
2009-10-13Reimport translations.Eric Fischer
Change-Id: Iec7e4e5662b07795cb016f35964346ee929e1cf4
2009-10-12am 615384c6: Fix bug 2157484 where SoundRecorder can crash when trying to ↵Jean-Michel Trivi
record during a call. On some platforms, you cannot be in a phone call and record audio at the same time. In such a situation, the MediaRecorder throws a Runtime exception. This CL catches this Merge commit '615384c62e2906613590e6f33a37f7dfe4276a59' * commit '615384c62e2906613590e6f33a37f7dfe4276a59': Fix bug 2157484 where SoundRecorder can crash when trying to record during a call.
2009-10-12am 560d8a70: Icons againMike Cleron
Merge commit '560d8a7070e976ec7a51775b1940599a26447bd0' * commit '560d8a7070e976ec7a51775b1940599a26447bd0': Icons again
2009-10-06Fix bug 2157484 where SoundRecorder can crash when trying to record during a ↵Jean-Michel Trivi
call. On some platforms, you cannot be in a phone call and record audio at the same time. In such a situation, the MediaRecorder throws a Runtime exception. This CL catches this exception and checks whether a call is underway or not. If it is, it will display an alert to the user indicating recording cannot be performed during a call.
2009-10-02Icons againandroid-sdk-tools_r4android-sdk-tools_r3android-sdk-2.0_r1android-2.0_r1Mike Cleron
2009-09-09am 9cca7f11: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
Merge commit '9cca7f11a7b47d07e49e2aba26b3be6d38978215' * commit '9cca7f11a7b47d07e49e2aba26b3be6d38978215': Import revised translations. DO NOT MERGE
2009-09-08Import revised translations. DO NOT MERGEEric Fischer
2009-08-28High-resolution (hdpi) artwork from TAT for SoundRecorder.Daniel Sandler
2009-08-04merge from open-source masterdonut-plus-aospJean-Baptiste Queru
2009-08-03am 86d064ed: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
Merge commit '86d064ed84e494ca829cbf6359f59d23f74c8f7b' * commit '86d064ed84e494ca829cbf6359f59d23f74c8f7b': Import revised translations. DO NOT MERGE
2009-08-03Import revised translations. DO NOT MERGEandroid-sdk-tools_r2android-sdk-1.6_r2android-sdk-1.6_r1android-sdk-1.6-docs_r1android-1.6_r2android-1.6_r1.5android-1.6_r1.4android-1.6_r1.3android-1.6_r1.2android-1.6_r1.1android-1.6_r1donut-release2donut-releasedonutEric Fischer
2009-07-29merge from donutJean-Baptiste Queru
2009-07-26reconcile korg/master into goog/masterJean-Baptiste Queru
2009-07-25Merge korg/donut into korg/masterJean-Baptiste Queru
2009-07-14Merge commit 'goog/readonly-korg-master' into merge_korg_masterJean-Baptiste Queru
2009-07-13am 107a0383: Import new translationsEric Fischer
Merge commit '107a038305ba3f7b27c872ba6fe2a8e47c134d62' * commit '107a038305ba3f7b27c872ba6fe2a8e47c134d62': Import new translations
2009-07-13Import new translationsEric Fischer
2009-06-10am 2caac5d2: am 6497d796: AI 149721: Import Portuguese translations.Eric Fischer
Merge commit '2caac5d21727c19e15db4deb37bd84f0aed6947b' * commit '2caac5d21727c19e15db4deb37bd84f0aed6947b': AI 149721: Import Portuguese translations.
2009-06-10am 6497d796: AI 149721: Import Portuguese translations.Eric Fischer
Merge commit '6497d796f0f1542b98d5d87c0a3865e8333d89d7' into donut * commit '6497d796f0f1542b98d5d87c0a3865e8333d89d7': AI 149721: Import Portuguese translations.
2009-06-10AI 149721: Import Portuguese translations.android-sdk-1.5_r3Eric Fischer
Automated import of CL 149721
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 02:26:17 +0000