Merge commit '7d776dbbc567e592f5e5ae5f2e24053cdce78f31' into eclair-mr2-plus-aosp * commit '7d776dbbc567e592f5e5ae5f2e24053cdce78f31': Correct non-opaque list separator assets.
Merge commit '7d776dbbc567e592f5e5ae5f2e24053cdce78f31' into eclair-mr2-plus-aosp * commit '7d776dbbc567e592f5e5ae5f2e24053cdce78f31': Correct non-opaque list separator assets.