tree 365346b4c877d12cf28507fb6c538bf130e4effe
parent 1918e8271f4ca9a2a9686c5f5ff01653522e58d6
parent bf29b8cdd643947579b94911d387fbbf66f2096c
author Ed Heyl <ed@google.com> 1343315730 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343315730 -0700

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

* commit 'bf29b8cdd643947579b94911d387fbbf66f2096c':