am b2d652d1: am d43be56d: am 3c19d0e0: Doc change: increment androidappdocs version.
Merge "Add in "plugin" support to allow users to add their own plugin's via JAR files and the -plugin command line argument. Also make sure that the arguments passed on the command line correctly get set in sys.argv."
Add missing properties to make the simulator work again.

Change-Id: I9c650360705960630198cb8006a3f83188ddd345
Add in python unit tests and fix up java unit tests.

Change-Id: I3930946364d5ca8a5d18e4a2b36a7afa298ef2de
Merge "Add in python unit tests and fix up java unit tests."
- Improve ScriptRunner command line parsing to actually pass more of the arguments. (And a unit test to go with it).
- Set __name__ inside the scriptfile runner so python scripts expecting it get it.
- Propagate sys.exit error codes so monkeyrunner will actually return those error codes.
- Better handle PyExceptions thrown by the script to actually terminate monkeyrunner.
- Bubble up installPackage and removePackage error codes so callers can tell if they worked or not.

Change-Id: Ia4717b1ad2c9b4cccd607aba00211f2f85dfb412
am d9c6e694: (-s ours) am 6e6c1ebd: (-s ours) am 02ad7fc2: Move the rev of the froyo sdk component to 2. Do not merge
Fix 2673731: Adding support for password history to the Device Admin Sample App.

Change-Id: I1380ff9475c201d3c2ec2ec449b1103c3d55a3a7
am 13cf156b: am 8824549d: am 99cb1d16: Merge "Spelling fix for source download page" into froyo
Add CalendarProvider and ContactsProvider intermediates

Required for new usage of EventLogTags.

Change-Id: Ia90af8b791270217a2d2d3cf06b3d772aaaad137
Fixing accidentally-stripped formatting on the code style guidelines. Also
fixing a bunch of @Annotation references, to silence some droiddoc warnings.

Change-Id: I810faa6dc25392fc6ec9569876878fe9ac5e6603
Merge "Fixing accidentally-stripped formatting on the code style guidelines. Also fixing a bunch of @Annotation references, to silence some droiddoc warnings."
Fix syntax errors in command lines for update-java-alternatives and curl.

Change-Id: Ib5b2be53b5d7f99d48f0c8366174ed94d4bcfa82
Remove obsolete Eclipse instruction for dev on tools.

These (updated) will be added to a different section later.

Change-Id: Ib5bc1b768cd95c4bc8fd082a7395a3ebb2c0472e
Merge "Fix 2673731: Adding support for password history to the Device Admin Sample App."
am 67dfcbf1: am 59b6dce0: am 39d7a745: Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo
am 8aede04b: Add positional parameters to aid in i18n
am 68f37ab9: Merge "Add coverage_targets.xml into test image" into kraken
Merge "Remove obsolete Eclipse instruction for dev on tools."
Adding a page to the compatibility site referenced by the 2.1 CDD.
This page lists the allowed version strings.

Change-Id: Iffbe0f1739a5daae8f2aa447b86af12aa7142a31