am 3ebde8a2: am 942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1

* commit '3ebde8a2304296565a870339cd47bfc08b021083':