Merge commit '085f4f29da60da8bed71b5f8ab2ba3b56cd4923e'
* commit '085f4f29da60da8bed71b5f8ab2ba3b56cd4923e':
Merge the new Ant script rules and template from Eclair (do not merge)
Merge commit '8bc47e6e3da18df72110630eb6fdde82caa7d30d'
* commit '8bc47e6e3da18df72110630eb6fdde82caa7d30d':
Import testrunner changes from puppetmaster to keep them in sync.
Merge commit '855489d1f98d7dd19e49acfc6b6c2d186334e998'
* commit '855489d1f98d7dd19e49acfc6b6c2d186334e998':
Add contacts tests to the continuous test cycle
Merge commit 'e73b8485a926ba1b4ec438b57e89c9c84200945a'
* commit 'e73b8485a926ba1b4ec438b57e89c9c84200945a':
Add xdpi and ydpi to layout-configs XML Schema.
Merge commit '0f4c48a4c7398e9d678c5212ba73155e0694b61d'
* commit '0f4c48a4c7398e9d678c5212ba73155e0694b61d':
Fix the skins to do proper dpad rotation in landscape mode.
Merge commit '84dcb451c210d6e93f5f516c27b781c067544895' into eclair-plus-aosp
* commit '84dcb451c210d6e93f5f516c27b781c067544895':
Add unit test for new keystore.
Merge commit '3b5cbc5472c96deb80d90fde815bff486fd82cba' into eclair-plus-aosp
* commit '3b5cbc5472c96deb80d90fde815bff486fd82cba':
Merge the new Ant script rules and template from Eclair (do not merge)
Merge commit '1fed48849dcadedb68211c5d55c1b452d05b98bc' into eclair-plus-aosp
* commit '1fed48849dcadedb68211c5d55c1b452d05b98bc':
Move to 1.6_r2 (DO NOT MERGE)
Merge commit 'fff9ff696709e17ad73ae654e511907282bfc0fd' into eclair
* commit 'fff9ff696709e17ad73ae654e511907282bfc0fd':
Merge the new Ant script rules and template from Eclair (do not merge)
Merge commit 'fa4fb905877d879f2a593e0726108784f204dc5d' into eclair-plus-aosp
* commit 'fa4fb905877d879f2a593e0726108784f204dc5d':
Add support for 'android update test-project'.
It correctly only refuses to edit @string/blah now.
This CL also does a bit of refactoring; I extracted some methods
and a class to make it a bit easier to read.
BUG 2066460
Change-Id: I95a34d28d6390ab0cc075f05ea83ceec04993ae9
Merge commit '7571d11b7016b4dada3ad4db218c7d29214a13ba' into eclair-plus-aosp
* commit '7571d11b7016b4dada3ad4db218c7d29214a13ba':
Import testrunner changes from puppetmaster to keep them in sync.
Merge commit 'e377fa60d19b76a81b245f0e525652cdd22eb95f' into eclair-plus-aosp
* commit 'e377fa60d19b76a81b245f0e525652cdd22eb95f':
Add contacts tests to the continuous test cycle
Merge commit '5ea7700ffa5ee22012f88255f62aa4af7a1b840c' into eclair-plus-aosp
* commit '5ea7700ffa5ee22012f88255f62aa4af7a1b840c':
Add xdpi and ydpi to layout-configs XML Schema.
Merge commit 'b6d2a4990a21b78355ff95d62fd698b1dddbd793' into eclair-plus-aosp
* commit 'b6d2a4990a21b78355ff95d62fd698b1dddbd793':
Fix the skins to do proper dpad rotation in landscape mode.
Merge commit '3c8d2e272b71cca814dd694c3ba548f4a2a3a0a0' into eclair
* commit '3c8d2e272b71cca814dd694c3ba548f4a2a3a0a0':
Fix the skins to do proper dpad rotation in landscape mode.
Merge commit '2296cfbd37e696bd32e92c88a30dd290c7470018'
* commit '2296cfbd37e696bd32e92c88a30dd290c7470018':
Fix bug 2142296 where the user couldn't back out of the JetBoy demo.
Merge commit '51c5bc22bee411cf17ecdec88c8f1c4258594f1f'
* commit '51c5bc22bee411cf17ecdec88c8f1c4258594f1f':
Fix NDK usage of libgcc.a when building shared libraries
Merge commit '1028accb55919c0a84a4871002efb19a202c475c' into eclair-plus-aosp
* commit '1028accb55919c0a84a4871002efb19a202c475c':
Fix NPE when opening new layout file.
Merge commit '5bc6141cb29913d344b4a7881956af8b5074f560' into eclair-plus-aosp
* commit '5bc6141cb29913d344b4a7881956af8b5074f560':
Add development setting for compatibility mode.