tree f875faaae2bd7875140631fa1a9ad3f83e51aa17
parent 8a82c9469ac602488bbcfa454b333e73a01a81d2
parent a1e3895791ffaff12b0462ba82df906156ce1ae8
author Michael Jurka <mikejurka@google.com> 1348000272 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348000272 -0700

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

* commit 'a1e3895791ffaff12b0462ba82df906156ce1ae8':
  Fixing some warnings