Merge commit '64ce0f8f5315e3a364aea047360520b097e7a7cd' into eclair-plus-aosp * commit '64ce0f8f5315e3a364aea047360520b097e7a7cd': First pass at replacing native plugin views with java.
Merge commit '64ce0f8f5315e3a364aea047360520b097e7a7cd' into eclair-plus-aosp * commit '64ce0f8f5315e3a364aea047360520b097e7a7cd': First pass at replacing native plugin views with java.