Merge commit '20e7a15bb74d7349ee879bb311a0607325f49aaf' into eclair-mr2-plus-aosp
* commit '20e7a15bb74d7349ee879bb311a0607325f49aaf':
Modify Monkey so that scripts can use raw and user events.
Fix javadoc comment in MonkeySourceRandom.java and combine raw events and user
events in MonkeySourceScript.java. Also, fix bug where too few arguments in
the script causes a RuntimeException.
Merge commit '8a87b652e6d43ee67a2ed8fae2679fb4b41e21a3'
* commit '8a87b652e6d43ee67a2ed8fae2679fb4b41e21a3':
Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
Merge commit '0d43991074e178c388b06b2f8984967c140451b9' into eclair-mr2-plus-aosp
* commit '0d43991074e178c388b06b2f8984967c140451b9':
Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
Merge commit '302e013b6a338fc9a7bbc4fa4fc68e0cb95bc38b' into eclair-plus-aosp
* commit '302e013b6a338fc9a7bbc4fa4fc68e0cb95bc38b':
Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
Merge commit '302e013b6a338fc9a7bbc4fa4fc68e0cb95bc38b' into eclair-mr2
* commit '302e013b6a338fc9a7bbc4fa4fc68e0cb95bc38b':
Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
Merge commit 'fc5b5aecdeca8bb32eba9d38961b6649395f8913' into eclair
* commit 'fc5b5aecdeca8bb32eba9d38961b6649395f8913':
Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
Merge commit 'e0b0c2ccf1e267f843e9890b87d6649b8dc6059c'
* commit 'e0b0c2ccf1e267f843e9890b87d6649b8dc6059c':
Add save/load for the user-made Layout Devices. (do not merge)
Merge commit '1a63ee0bbb10ecb666a5953dd1e1d0e1578157ad' into eclair-mr2-plus-aosp
* commit '1a63ee0bbb10ecb666a5953dd1e1d0e1578157ad':
Add save/load for the user-made Layout Devices. (do not merge)
Merge commit 'cad5cf2e9dffa8735435c3a046438028f1a1832a' into eclair-mr2-plus-aosp
* commit 'cad5cf2e9dffa8735435c3a046438028f1a1832a':
WQVGA skin (240x400) (do not merge)
Merge commit '15549af01e6d1d62b56e825800191d223c4f29a2' into eclair-mr2
* commit '15549af01e6d1d62b56e825800191d223c4f29a2':
Add save/load for the user-made Layout Devices. (do not merge)
Merge commit '81747d726994d027d64652a6f6ee59d76427df31' into eclair-mr2
* commit '81747d726994d027d64652a6f6ee59d76427df31':
WQVGA skin (240x400) (do not merge)
Merge commit '15549af01e6d1d62b56e825800191d223c4f29a2' into eclair-plus-aosp
* commit '15549af01e6d1d62b56e825800191d223c4f29a2':
Add save/load for the user-made Layout Devices. (do not merge)
Merge commit '81747d726994d027d64652a6f6ee59d76427df31' into eclair-plus-aosp
* commit '81747d726994d027d64652a6f6ee59d76427df31':
WQVGA skin (240x400) (do not merge)
Merge commit 'af496633406c19192db960d822b51fa1f574fbf2' into eclair
* commit 'af496633406c19192db960d822b51fa1f574fbf2':
Add save/load for the user-made Layout Devices. (do not merge)
Merge commit '5e4efac4f7c95206bb91d28b6ebb8b5aa36ed5bf' into eclair
* commit '5e4efac4f7c95206bb91d28b6ebb8b5aa36ed5bf':
WQVGA skin (240x400) (do not merge)
This contains the following changes:
- a new interface IPackageVersion for all Package classes that can
provide an AndroidVersion getVersion().
- fixes the "update sdk" where the local repo has no doc by suggesting
to install the most up-to-date doc.
- fixes a bad cast in the UpdaterLogic.
- normalizes the long descriptions but adding the revision if not
present.
- fixes an edge case when displaying the very long description of the
docs package, i.e. need to indicate it is upgraded due to a version
change.
SDK BUG 2192352
This contains the following changes:
- a new interface IPackageVersion for all Package classes that can
provide an AndroidVersion getVersion().
- fixes the "update sdk" where the local repo has no doc by suggesting
to install the most up-to-date doc.
- fixes a bad cast in the UpdaterLogic.
- normalizes the long descriptions but adding the revision if not
present.
- fixes an edge case when displaying the very long description of the
docs package, i.e. need to indicate it is upgraded due to a version
change.
SDK BUG 2192352
Change-Id: I87eda018b450ca9973e4f3b55caef964c0b31480
Merge commit 'c7774433dd82db05a4f92edf3f9d77f5d7c123b0' into eclair-mr2-plus-aosp
* commit 'c7774433dd82db05a4f92edf3f9d77f5d7c123b0':
Add save/load for the user-made Layout Devices.
Merge commit 'bc3c3394fb773346eff4b4a0b695ff00edcc821e' into eclair-plus-aosp
* commit 'bc3c3394fb773346eff4b4a0b695ff00edcc821e':
Add save/load for the user-made Layout Devices.
Merge commit 'bc3c3394fb773346eff4b4a0b695ff00edcc821e' into eclair-mr2
* commit 'bc3c3394fb773346eff4b4a0b695ff00edcc821e':
Add save/load for the user-made Layout Devices.
