Merge commit '3c828e24a950a7fa4d17e22b5afa37a4006126f0' into eclair-mr2-plus-aosp * commit '3c828e24a950a7fa4d17e22b5afa37a4006126f0': Add partial support of Android-specific properties.
Merge commit '3c828e24a950a7fa4d17e22b5afa37a4006126f0' into eclair-mr2-plus-aosp * commit '3c828e24a950a7fa4d17e22b5afa37a4006126f0': Add partial support of Android-specific properties.