Merge in some android customizations. Minor cleanup.
am: dcb310be Change-Id: I21ae839d8e5b7c109ea7652a310aa3f7a856fe1f
Loading
am: dcb310be Change-Id: I21ae839d8e5b7c109ea7652a310aa3f7a856fe1f
mentioned in commit 0e677582
mentioned in commit 0ff9c3cf
mentioned in commit e166d16c
mentioned in commit 470394b2
mentioned in commit a559dd1a
mentioned in commit 7a195ac7