tree a9befdae109faf4a6a500380248000b87f546289
parent 565b62f354d8b6aadc760092a7dbf483f8bbbe17
parent b591640f590b9ba133d1cae37aba038d1f9d4a86
author Makoto Onuki <omakoto@google.com> 1331335085 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1331335085 -0800

am b591640f: am 7f2bbd3b: am 1cd70006: Merge "Adjust a variable type conversion."

* commit 'b591640f590b9ba133d1cae37aba038d1f9d4a86':
  Adjust a variable type conversion.