am 7500eded: Fix issues 2333450 and 2333559:
Merge commit '7500eded35ce173525d7fc1e8172679188d3b33a' into eclair-plus-aosp * commit '7500eded35ce173525d7fc1e8172679188d3b33a': Fix issues 2333450 and 2333559:
This commit is contained in:
commit
1d3e56aaa2