tree 6445a92572359e0fd8d6c84b6dc8cc45a97ac954
parent 57aecec5bb4856579ffa4066c100db702c96f2a8
parent 671a3a227c0ca880b0bf4ee93623efb61a4a6be5
author Michael Jurka <mikejurka@google.com> 1348000149 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348000149 -0700

am 671a3a22: Merge "Fixing some warnings" into jb-mr1-dev

* commit '671a3a227c0ca880b0bf4ee93623efb61a4a6be5':
  Fixing some warnings