Merge "Add in a help script to generate text and html formats of the MonkeyRunner help."
Merge "Change help test generation to use clearsilver templates just like the rest of the system.  This should more easily allow customization of the generated output."
Also dist the original linux sdk package for wind_sdk build.

Change-Id: I64dab5763dc7c7398582c5a30c126c7e3e6afe32
Reorganize community IRC information

Add #android-firehose and add hyperlinks to the IRC channels themselves,
because we're using the HTML!

Change-Id: I4704235a00afe6b48187774debb80a101f304266
am 0e968fa2: Merge "Workaround for package-private framework tests in runtest." into gingerbread

Merge commit '0e968fa2eec9dcdbb0ab075be9489cc9e4ad9c99' into gingerbread-plus-aosp

* commit '0e968fa2eec9dcdbb0ab075be9489cc9e4ad9c99':
  Workaround for package-private framework tests in runtest.
resolved conflicts for merge of fa6e5585 to master

Change-Id: I967289246c3472a30f4623581226cbc3054f0b56
remove jarutils from the sdk packaging.

Change-Id: Ic3c91ff5e20a5bf6b7c3ad11eb6e6f4250c7613d
merge from open-source master

Change-Id: I3e12f866966fda80db5a0795eba9ff82bfe6547d
am 442396be: remove jarutils from the sdk packaging.

Merge commit '442396be27a82850f99d4a891d02b8c95c9c1ef1' into gingerbread-plus-aosp

* commit '442396be27a82850f99d4a891d02b8c95c9c1ef1':
  remove jarutils from the sdk packaging.
am e389abdc: am 442396be: remove jarutils from the sdk packaging.

Merge commit 'e389abdc29eb2a9d523e64531975dde25a8e9617'

* commit 'e389abdc29eb2a9d523e64531975dde25a8e9617':
  remove jarutils from the sdk packaging.
remove apkbuilder.jar from the sdk build.

Change-Id: I82cca5c159c1f3210b98deebfd78e2844728b2ac
am fdbc1d7b: remove apkbuilder.jar from the sdk build.

Merge commit 'fdbc1d7bc1aa73c095b93808bd15b6eca02ea7c9' into gingerbread-plus-aosp

* commit 'fdbc1d7bc1aa73c095b93808bd15b6eca02ea7c9':
  remove apkbuilder.jar from the sdk build.
am 2f8cb6de: am fdbc1d7b: remove apkbuilder.jar from the sdk build.

Merge commit '2f8cb6de03df5283bc5a5e3afc6ff729804e6bc9'

* commit '2f8cb6de03df5283bc5a5e3afc6ff729804e6bc9':
  remove apkbuilder.jar from the sdk build.
Fix to invalid call to manifest.app_info

Change-Id: I7bb9f0b10ab814a6fd278d9c2ef1939d5ab9b671
Fix classpath to follow frameworks/base/policy changes.

Change-Id: I06cd6592af73ad8852983039a6d238f17eb979a9
merge from open-source master

Change-Id: I4e06b684dd46c317e1c206e584050dbee20be281
merge from froyo-plus-aosp

Change-Id: Icd2fa05c77fd2ec7c878520647e0024bf89b0504
am 29d09a18: merge from froyo-plus-aosp

Merge commit '29d09a18c50a2dd9412ca393f2f5657d3199c414'

* commit '29d09a18c50a2dd9412ca393f2f5657d3199c414':
  remove apkbuilder.jar from the sdk build.
  remove jarutils from the sdk packaging.
Make simulator boot in master.

Change-Id: I13fa4c188645049152cbfcf2139cf21acebaa370
Fix 2677197: Adding support for minimum number of complex characters to the Device Admin Sample App.

Change-Id: I7570f005ee665adc150e8c4fb92068b4d8dcdbb1