fixed right indent usage
Merge branch 'master' into ice-cream-sandwich