tree 39a51fe69514273022d69b7e354d241ad2856b03
parent db08d5168e51be52dd50e3bb9015fe69f106fb36
parent 170bf8ee9a4f3df4515bd663def26cd721450012
author Brian Carlstrom <bdc@google.com> 1346193311 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346193311 -0700

am 170bf8ee: Merge "Fix build warning."

* commit '170bf8ee9a4f3df4515bd663def26cd721450012':
  Fix build warning.