tree 5fa7786ade1bc93ac499db8db42eecdb9a7c64d3
parent 56ad03cae13524b32898dc4ccf01040ced5a53b4
parent bacdfc0ed9a0882ee3e9ee889a8fd4cabb9a71f3
author Kenny Root <kroot@android.com> 1361987941 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1361987941 +0000

am bacdfc0e: Merge "Fix compiling warnings"

* commit 'bacdfc0ed9a0882ee3e9ee889a8fd4cabb9a71f3':
  Fix compiling warnings