Merge commit '0f9a91c94fa9f3b0082744efe2457528ef19fa62'
* commit '0f9a91c94fa9f3b0082744efe2457528ef19fa62':
DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Merge commit '0ee89a72d50ff4bc5c7d2a285cd799d3a8b48efb' into gingerbread-plus-aosp
* commit '0ee89a72d50ff4bc5c7d2a285cd799d3a8b48efb':
DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Merge commit 'a39896119566a952647c392872c0ab99e9de7371' into gingerbread-plus-aosp
* commit 'a39896119566a952647c392872c0ab99e9de7371':
Cleanspec to make sure everything works consistently after turning off OpenCore.
Merge commit 'a681bae5f6d2cc84d0ff54bb117ecd025062bbce'
* commit 'a681bae5f6d2cc84d0ff54bb117ecd025062bbce':
Link against Mac OSX 10.5 SDK if building on 10.6.
Merge commit '9a8732fb6c6a569495e3695fc1e2b638de209beb' into gingerbread-plus-aosp
* commit '9a8732fb6c6a569495e3695fc1e2b638de209beb':
Link against Mac OSX 10.5 SDK if building on 10.6.
Merge commit '200f25984ccc8a9e5fc13bfbcde22c17bc80d410' into gingerbread-plus-aosp
* commit '200f25984ccc8a9e5fc13bfbcde22c17bc80d410':
Build without OpenCore by default, remove obsolete opt-in to stagefright.
Moved Android.mk and keymap files except AVRCP.kl from sdk/emulator/keymaps
to build/target/board/generic. This causes the keymap files to copied into
the system image of generic and sdk products, but not into the system image
of HW products. Originally the qwerty.kl was copied to target no matter
if the target had a qwerty keyboard or not, which is the case for e.g.
the Nexus One.
Change-Id: I7cd80497632fb3b9e7ce2f3a7888d4924a355f52
Merge commit '6ba4b59c9067b747ab2a4c85621e656c4d4614e3' into gingerbread-plus-aosp
* commit '6ba4b59c9067b747ab2a4c85621e656c4d4614e3':
SDK: add hierarchyviewer2 to windows target list.
Merge commit 'aa6dbe2144196bb6f9c1b6b539126250f9ef8af6' into gingerbread-plus-aosp
* commit 'aa6dbe2144196bb6f9c1b6b539126250f9ef8af6':
Try to fix system.img in update zip file.
Merge commit '485bd44d0d78f9f612075e17db1adb281741c84f'
* commit '485bd44d0d78f9f612075e17db1adb281741c84f':
Fix mkyaffs2image extra flags in the release tools.
Merge commit 'd421f57d22009e4d9ce71298c2f93636ff9e7d9d' into gingerbread-plus-aosp
* commit 'd421f57d22009e4d9ce71298c2f93636ff9e7d9d':
Fix mkyaffs2image extra flags in the release tools.
Merge commit 'f11fc5f098ab8481887cbbbbb4246f63837b61c9'
* commit 'f11fc5f098ab8481887cbbbbb4246f63837b61c9':
Disable building OTA package if there is no kernel.
Merge commit 'fb0a347b747a91173c8a9f845a0362e3f8a9701f' into gingerbread-plus-aosp
* commit 'fb0a347b747a91173c8a9f845a0362e3f8a9701f':
Disable building OTA package if there is no kernel.
Merge commit '68bb65177cc6839e985c0a54343f44494de61d62' into gingerbread-plus-aosp
* commit '68bb65177cc6839e985c0a54343f44494de61d62':
Show command lines run by releasetools.
