Merge commit 'd4a4729c0cac582a2dcec7c8cfb316b81885a0f0' into eclair-mr2-plus-aosp * commit 'd4a4729c0cac582a2dcec7c8cfb316b81885a0f0': Update imports to android-common
Merge commit 'd4a4729c0cac582a2dcec7c8cfb316b81885a0f0' into eclair-mr2-plus-aosp * commit 'd4a4729c0cac582a2dcec7c8cfb316b81885a0f0': Update imports to android-common