The Android Open Source Project
08a42a053f
am 9867f949: merge from open-source master
...
Merge commit '9867f9491cb0b61a7ddeae616b2fdd4dca709f63' into kraken
* commit '9867f9491cb0b61a7ddeae616b2fdd4dca709f63':
Replaced Deprecated GestureDetector API Call
2010-06-02 07:47:55 -07:00
The Android Open Source Project
4912afb1a5
am 2d75ee4a: merge from open-source master
...
Merge commit '2d75ee4ad0034d81350602567b8d76b1278e7edc' into kraken
* commit '2d75ee4ad0034d81350602567b8d76b1278e7edc':
removed unused imports
2010-06-02 07:46:27 -07:00
The Android Open Source Project
9867f9491c
merge from open-source master
...
Change-Id: If51f538438a5da22d4f04cb6d251603b4abd08f0
2010-06-02 07:45:47 -07:00
The Android Open Source Project
2d75ee4ad0
merge from open-source master
...
Change-Id: I69d4b5355019fa58ef5a00e6f53e553ea71f2f90
2010-06-02 07:44:48 -07:00
The Android Open Source Project
d31ee22ff2
am aebe000c: merge from open-source master
...
Merge commit 'aebe000cfa26eb84031f7385bf363868a70f39ff' into kraken
* commit 'aebe000cfa26eb84031f7385bf363868a70f39ff':
removed unused imports
2010-06-02 07:42:49 -07:00
The Android Open Source Project
4a4484be62
am 4bdec4ab: merge from open-source master
...
Merge commit '4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf' into kraken
* commit '4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf':
removed unused imports
2010-06-02 07:41:00 -07:00
The Android Open Source Project
5482eca13a
am 032ae72e: merge from open-source master
...
Merge commit '032ae72e19d9a12fff483664b975392ef63f2fb7' into kraken
* commit '032ae72e19d9a12fff483664b975392ef63f2fb7':
Removed unused import
2010-06-02 07:37:37 -07:00
The Android Open Source Project
aebe000cfa
merge from open-source master
...
Change-Id: If08c1d42c870c8828b403ed322f3e93f07bb845a
2010-06-02 07:37:13 -07:00
The Android Open Source Project
4bdec4ab5d
merge from open-source master
...
Change-Id: I0d2492c58689315f4caaa9bcb908296c26f53ed6
2010-06-02 07:35:57 -07:00
The Android Open Source Project
0f57228bd3
am 43abe820: merge from open-source master
...
Merge commit '43abe820f2a46746dcd7b86db593c08b9e1f938d' into kraken
* commit '43abe820f2a46746dcd7b86db593c08b9e1f938d':
Reduced Warnings
2010-06-02 07:31:14 -07:00
The Android Open Source Project
032ae72e19
merge from open-source master
...
Change-Id: I3225d2a7b1e4b0ea60941a452285137980c1a921
2010-06-02 07:30:37 -07:00
The Android Open Source Project
43abe820f2
merge from open-source master
...
Change-Id: I6e4280a7f664c84bdd5205db642ed0ae63bc5e3b
2010-06-02 07:28:32 -07:00
The Android Open Source Project
74a0b22062
am 740c3e2e: merge from open-source master
...
Merge commit '740c3e2e97a4cca24ecb534de72663ced238156a' into kraken
* commit '740c3e2e97a4cca24ecb534de72663ced238156a':
Updated deprecated Contacts API to ContactsContract
2010-06-02 07:27:39 -07:00
The Android Open Source Project
85c4a21b9e
am 8cc5a816: merge from open-source master
...
Merge commit '8cc5a8166dcdccfdb7f379a05190cef43f91c423' into kraken
* commit '8cc5a8166dcdccfdb7f379a05190cef43f91c423':
Updated Sensor Samples to newest API
2010-06-02 07:27:37 -07:00
The Android Open Source Project
740c3e2e97
merge from open-source master
...
Change-Id: I02c592cc054ac16e494ca7a34673ffb562287b01
2010-06-02 07:23:24 -07:00
The Android Open Source Project
8cc5a8166d
merge from open-source master
...
Change-Id: I900ca65f70c1a66781fb5f6f37c45961416d5650
2010-06-02 07:22:11 -07:00
Guang Zhu
68f37ab918
Merge "Add coverage_targets.xml into test image" into kraken
2010-06-01 15:55:21 -07:00
Guang Zhu
ea7e48c8be
Add coverage_targets.xml into test image
...
This file is needed to get coverage targets definition when running code
coverage
Change-Id: If48ad5d9693eaa5857a308f2d304f388d5d8c4d5
2010-06-01 14:38:23 -07:00
Kenny Root
8aede04bf2
Add positional parameters to aid in i18n
...
Different languages might have different word orders, so add in
positional parameters for strings that have more than one substitution.
Change-Id: Ie9fc74eb0a22471b272e65c6cd521f1518b322d1
2010-06-01 11:50:47 -07:00
Yu Shan Emily Lau
67dfcbf17b
am 59b6dce0: am 39d7a745: Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo
...
Merge commit '59b6dce0d5035b44dd8d99523efc63a469246f42' into kraken
* commit '59b6dce0d5035b44dd8d99523efc63a469246f42':
Added the instrumentation and power log monkey events fro the new power framework.
2010-05-28 15:54:27 -07:00
Yu Shan Emily Lau
59b6dce0d5
am 39d7a745: Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo
...
Merge commit '39d7a7451b7e43dc1d71ac983821e76c88775a81' into froyo-plus-aosp
* commit '39d7a7451b7e43dc1d71ac983821e76c88775a81':
Added the instrumentation and power log monkey events fro the new power framework.
2010-05-28 15:50:23 -07:00
Yu Shan Emily Lau
39d7a7451b
Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo
2010-05-28 15:38:48 -07:00
Yu Shan Emily Lau
2952b49c7c
Added the instrumentation and power log monkey events fro the new power framework.
...
Change-Id: I3102e6caaba8763a2197ff80f13c8d127ea42316
2010-05-28 13:48:42 -07:00
Kenny Root
13cf156b85
am 8824549d: am 99cb1d16: Merge "Spelling fix for source download page" into froyo
...
Merge commit '8824549dce27b5bb3085e6a83f06ca4d16b78ea6' into kraken
* commit '8824549dce27b5bb3085e6a83f06ca4d16b78ea6':
Spelling fix for source download page
2010-05-26 15:39:52 -07:00
Kenny Root
8824549dce
am 99cb1d16: Merge "Spelling fix for source download page" into froyo
...
Merge commit '99cb1d16cc609866bb17c729d9b41926924ab4dd' into froyo-plus-aosp
* commit '99cb1d16cc609866bb17c729d9b41926924ab4dd':
Spelling fix for source download page
2010-05-26 15:38:05 -07:00
Kenny Root
99cb1d16cc
Merge "Spelling fix for source download page" into froyo
2010-05-26 15:36:27 -07:00
Xavier Ducrohet
d9c6e6948a
am 6e6c1ebd: (-s ours) am 02ad7fc2: Move the rev of the froyo sdk component to 2. Do not merge
...
Merge commit '6e6c1ebd77a6a353bf2af77035c73c606311d8c3' into kraken
* commit '6e6c1ebd77a6a353bf2af77035c73c606311d8c3':
Move the rev of the froyo sdk component to 2. Do not merge
2010-05-26 13:52:59 -07:00
Xavier Ducrohet
6e6c1ebd77
am 02ad7fc2: Move the rev of the froyo sdk component to 2. Do not merge
...
Merge commit '02ad7fc23a8f6a6eddf8ac25138c78f2fd5e8ed7' into froyo-plus-aosp
* commit '02ad7fc23a8f6a6eddf8ac25138c78f2fd5e8ed7':
Move the rev of the froyo sdk component to 2. Do not merge
2010-05-26 13:51:54 -07:00
Xavier Ducrohet
02ad7fc23a
Move the rev of the froyo sdk component to 2. Do not merge
...
Change-Id: I44b05cd40dad2df760d3d259246a714b82ddf9a2
2010-05-26 13:48:10 -07:00
Christian Mehlmauer
58ff1585cd
Replaced Deprecated GestureDetector API Call
...
Change-Id: I36429680b555f834e74ec86c6aa17b696d17d2b6
2010-05-25 20:17:51 +02:00
Dirk Dougherty
b2d652d1c0
am d43be56d: am 3c19d0e0: Doc change: increment androidappdocs version.
...
Merge commit 'd43be56d40a813bedf96203c4b58056c6139eec0' into kraken
* commit 'd43be56d40a813bedf96203c4b58056c6139eec0':
Doc change: increment androidappdocs version.
2010-05-24 10:25:09 -07:00
Dirk Dougherty
d43be56d40
am 3c19d0e0: Doc change: increment androidappdocs version.
...
Merge commit '3c19d0e052fae5f21f8e8592143a24919b106743' into froyo-plus-aosp
* commit '3c19d0e052fae5f21f8e8592143a24919b106743':
Doc change: increment androidappdocs version.
2010-05-24 10:23:08 -07:00
Dirk Dougherty
3c19d0e052
Doc change: increment androidappdocs version.
...
Change-Id: Ifd517ed5c51cb95fdc4cc83d5521242086d59534
2010-05-24 10:17:06 -07:00
Christian Mehlmauer
63c3bf98d1
Added missing classpathentry for DeskClock App, Bluetooth, obex, Gallery3D, Launcher2, GlobalSearch and Provision
...
Change-Id: I9754d1049a22e7b677b3537f5c3e9b9f4d239e39
2010-05-23 10:56:48 +02:00
Andy McFadden
26dc36123f
Sim fixes.
...
Pulled a fix to the simulator app ("long" is 64-bit when 32-bit was
needed) from master. sim-eng is useful for verifying the x86 SMP stuff.
Also quieted a compiler warning.
Change-Id: I399ea4923b7e0650d5f995e056c751374b057fbd
2010-05-21 11:00:14 -07:00
Christian Mehlmauer
97d0e8ddb7
Removed unused Imports, Added Type Arguments, removed some Warnings by using unused Methods and Variables
...
Change-Id: I39a4eb2b17f3411b17fcc49cbbbe396e89fab24a
2010-05-21 19:34:32 +02:00
Christian Mehlmauer
a3396e0940
Added Type Arguments to Samples, to reduce Warnings and get a litle bit more Compiler Code checking for "new" Android Programmers
...
Change-Id: I25add019e99fec88c8422da14f3e18246ca0f0b5
2010-05-21 07:28:31 +02:00
Romain Guy
91cd277060
Merge "removed unused imports"
2010-05-20 22:11:49 -07:00
Romain Guy
8b676d1916
Merge "removed unused imports"
2010-05-20 22:10:43 -07:00
Romain Guy
72d89196dd
Merge "removed unused imports"
2010-05-20 22:10:15 -07:00
Romain Guy
c34cbee5b2
Merge "Removed unused import"
2010-05-20 22:09:03 -07:00
Christian Mehlmauer
bed675c09d
Reduced warnings by removing unused imports, unused variables and adding type arguments
...
Change-Id: I551403a94de87a2fdf24ac0175ce69b4c8a48d54
2010-05-20 21:14:24 +02:00
Christian Mehlmauer
60a798eff5
removed unused imports
...
Change-Id: Ic48743a984bae2140e7e8f1b451be0f3760179f0
2010-05-20 21:07:30 +02:00
Christian Mehlmauer
ed674c1ec7
removed unused imports
...
Change-Id: I26fd85aa922e73c49ac319ed2b9f9e31603ced7b
2010-05-20 21:06:37 +02:00
Christian Mehlmauer
942e696486
removed unused imports
...
Change-Id: I1411ee3d0229918a6ff3837894d63f775550da27
2010-05-20 21:04:57 +02:00
Christian Mehlmauer
019a7e463b
Removed unused import
...
Change-Id: I85a1120ff8f9bc7186cdbc07c78d91a8d136fd5a
2010-05-20 20:35:14 +02:00
Christian Mehlmauer
38dcb296c9
Reduced Warnings
...
Change-Id: I3ce0d27d24e8aad3fdbf8c57cefe39d1a3fd99e9
2010-05-20 20:13:51 +02:00
Romain Guy
4b5c09f29e
Merge "Updated deprecated Contacts API to ContactsContract"
2010-05-19 22:06:53 -07:00
Romain Guy
d2e12d0428
Merge "Updated Sensor Samples to newest API"
2010-05-19 22:06:33 -07:00
Christian Mehlmauer
62e6bdb0fe
Updated deprecated Contacts API to ContactsContract
...
Change-Id: I1d51b5eba579e841d6024eec08670ae8ff595f94
2010-05-20 06:29:48 +02:00
