tree 365346b4c877d12cf28507fb6c538bf130e4effe
parent 1e3839b21858ad0ff80470ac345151880653e24c
parent 3551e3cc6ca5ad0a39e22453a0665d0c55766ee3
author Ed Heyl <ed@google.com> 1343315337 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343315337 -0700

am 3551e3cc: am 8165f0dd: resolve conflicts w/4f174f1d27adbde6f50e11ee3a8eaf162a030284

* commit '3551e3cc6ca5ad0a39e22453a0665d0c55766ee3':