tree b7d85451356c916a4f4c89bffcfcb896e20e8421
parent 6f67cd224e6ffdfa2619849eb4b9b2ff6c1e2c59
parent 59e9a496b4341fd2b11d4a01544bf7edf3d00cc5
author Elliott Hughes <enh@google.com> 1360269263 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360269263 -0800

am 59e9a496: Merge "__progname should be const char*, not char*."

# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '59e9a496b4341fd2b11d4a01544bf7edf3d00cc5':
  __progname should be const char*, not char*.