Dan Egnor
7e7d75eefd
am 27626c03: Add API key to BackupRestore sample code.
...
Merge commit '27626c03e4db54d1edfaa28f10bef1ef9ded9995' into froyo-plus-aosp
* commit '27626c03e4db54d1edfaa28f10bef1ef9ded9995':
Add API key to BackupRestore sample code.
2010-06-03 14:08:35 -07:00
Dan Egnor
27626c03e4
Add API key to BackupRestore sample code.
...
Change-Id: If80cbceffc213fdc6059fe22bf0e24520fba5f2d
Bug: 2735063
2010-06-03 13:38:57 -07:00
Dan Morrill
e469f8e8f3
Fixing an incorrect link to contact the Compat team.
...
Change-Id: Ie63b3b781404fa997e02101fef74ceb54f438d01
2010-06-03 10:37:31 -07:00
Guang Zhu
d40398268a
am c2b27167: fix earlier change for coverage_targets.xml
2010-06-02 22:23:27 -07:00
Guang Zhu
c2b27167dd
fix earlier change for coverage_targets.xml
...
due to previous incorrect change to Makefile, test_defs.xml is missing.
this will add it back in.
Change-Id: I4bd57d24757662477409ba02d3f71122e8e75238
2010-06-02 11:25:59 -07:00
Andrew Stadler
7ccf103089
Merge "Remove obsolete entries from .classpath"
2010-06-02 09:40:38 -07:00
The Android Open Source Project
30cc76b4b5
am 08a42a05: am 9867f949: merge from open-source master
2010-06-02 07:50:35 -07:00
The Android Open Source Project
b510836a46
am 4912afb1: am 2d75ee4a: merge from open-source master
2010-06-02 07:49:09 -07:00
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
fd24e94ac2
am d31ee22f: am aebe000c: merge from open-source master
2010-06-02 07:45:37 -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
e301b7b62b
am 4a4484be: am 4bdec4ab: merge from open-source master
2010-06-02 07:44:11 -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
451eb3b9b2
am 5482eca1: am 032ae72e: merge from open-source master
2010-06-02 07:42:37 -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
99dd14ff0d
am 0f57228b: am 43abe820: merge from open-source master
2010-06-02 07:37:36 -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
48bf2d5efa
am 74a0b220: am 740c3e2e: merge from open-source master
2010-06-02 07:30:55 -07:00
The Android Open Source Project
9541a5c0c2
am 85c4a21b: am 8cc5a816: merge from open-source master
2010-06-02 07:30:52 -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
Dan Morrill
178085d352
Adding a page to the compatibility site referenced by the 2.1 CDD.
...
This page lists the allowed version strings.
Change-Id: Iffbe0f1739a5daae8f2aa447b86af12aa7142a31
2010-06-01 17:19:15 -07:00
Xavier Ducrohet
ebf586a17b
Merge "Remove obsolete Eclipse instruction for dev on tools."
2010-06-01 16:58:34 -07:00
Guang Zhu
16b98fb001
am 68f37ab9: Merge "Add coverage_targets.xml into test image" into kraken
2010-06-01 16:11:18 -07:00
Kenny Root
895fa90b76
am 8aede04b: Add positional parameters to aid in i18n
2010-06-01 16:10:22 -07:00
Yu Shan Emily Lau
ce970403d8
am 67dfcbf1: am 59b6dce0: am 39d7a745: Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo
2010-06-01 16:08:42 -07:00
Konstantin Lopyrev
3ab6c0ca42
Merge "Fix 2673731: Adding support for password history to the Device Admin Sample App."
2010-06-01 15:59:45 -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
Andrew Stadler
2e974a0ce9
Remove obsolete entries from .classpath
...
Change-Id: Ia16cfec1af00e935ea2bd9033b5262fd8fccea56
2010-06-01 14:27:29 -07:00
Xavier Ducrohet
46b910832f
Remove obsolete Eclipse instruction for dev on tools.
...
These (updated) will be added to a different section later.
Change-Id: Ib5bc1b768cd95c4bc8fd082a7395a3ebb2c0472e
2010-06-01 14:25:10 -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
Jack Palevich
a85e0b9ae0
Fix syntax errors in command lines for update-java-alternatives and curl.
...
Change-Id: Ib5b2be53b5d7f99d48f0c8366174ed94d4bcfa82
2010-05-31 15:34:32 +08:00
Dan Morrill
e72ce256b0
Merge "Fixing accidentally-stripped formatting on the code style guidelines. Also fixing a bunch of @Annotation references, to silence some droiddoc warnings."
2010-05-28 16:18:25 -07:00
Dan Morrill
1aad93f698
Fixing accidentally-stripped formatting on the code style guidelines. Also
...
fixing a bunch of @Annotation references, to silence some droiddoc warnings.
Change-Id: I810faa6dc25392fc6ec9569876878fe9ac5e6603
2010-05-28 16:16:40 -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
Andrew Stadler
0ffca18ad9
Add CalendarProvider and ContactsProvider intermediates
...
Required for new usage of EventLogTags.
Change-Id: Ia90af8b791270217a2d2d3cf06b3d772aaaad137
2010-05-28 15:37:30 -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
4e1181adc3
am 13cf156b: am 8824549d: am 99cb1d16: Merge "Spelling fix for source download page" into froyo
2010-05-26 15:43:03 -07:00