tree cb7b05163761f97d448ec5f553f073a1fc6ad87c
parent 64b5e00aaa53dbca59e8b997184bf479f68915eb
parent 6ec3c4494d37dd0ac4fdc1da3a0aa875094c7d31
author Adrian Roos <roosa@google.com> 1416243223 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416243223 +0000

am 6ec3c449: am a1b32c47: Merge "Reduce user icon RAM usage" into lmp-mr1-dev

* commit '6ec3c4494d37dd0ac4fdc1da3a0aa875094c7d31':
  Reduce user icon RAM usage