tree a5f2daf4df9e1bcaf761f84ea2636c5e41a4a073
parent 9b7528cd58cacbcfca3b957b3749c45037516759
parent c5d2a7b0d6b85999731cc82ff945635fdea1e670
author Winson Chung <winsonc@google.com> 1317235758 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317235758 -0700

am c5d2a7b0: Merge "Fixing some small issues."

* commit 'c5d2a7b0d6b85999731cc82ff945635fdea1e670':
  Fixing some small issues.