tree 84af8c5898fdf943f643c93c5e618a79461244d0
parent 35820a1bb2e1cd20de6ad18277c250214497abf9
parent 9c70fcb66daea459038ff17e279b100680d2b552
author Joe Onorato <joeo@android.com> 1257989472 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257989472 -0800

am 9c70fcb6: am 63dacc5c: am a30ce8e6: Bug 2231692 - Turn off launcher2 logging.

Merge commit '9c70fcb66daea459038ff17e279b100680d2b552'

* commit '9c70fcb66daea459038ff17e279b100680d2b552':
  Bug 2231692 - Turn off launcher2 logging.