tree b916f47969c21b6cd330f51435ec71fc5f82bb73
parent f2ee14f99092efb28cfd07a5c8db4d15d09908b8
parent 5c362d4573d8c852855e3d769c4add282a27f6d5
author Brian Carlstrom <bdc@google.com> 1346193105 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346193105 -0700

am 5c362d45: Merge "Fix build warning."

* commit '5c362d4573d8c852855e3d769c4add282a27f6d5':
  Fix build warning.