tree e473e95dedf86870c3d0c81b91cadc947618cacd
parent 5f73a6863f75c54feec73e0f8dad7160e219197e
parent f442cf27c5d1229eb32973cb499578ccd63ba727
author Stephen Hines <srhines@google.com> 1344473044 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344473044 -0700

am f442cf27: am b3a5343e: Merge "Fixed a discarded const qualifier warning"

* commit 'f442cf27c5d1229eb32973cb499578ccd63ba727':
  Fixed a discarded const qualifier warning