tree dc327ad5e9fbc56e58197d64f6a154bb23bc3308
parent 999dff0ef3d92c1e84d12d3b8d8324c5ef441b85
parent 8a6abe380d2ba513bb714e54a74f4289089cbc18
author Elliott Hughes <enh@google.com> 1364247384 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364247384 -0700

am 8a6abe38: am bd014c2e: Merge "Remove some dead script code and fix a script comment."

* commit '8a6abe380d2ba513bb714e54a74f4289089cbc18':
  Remove some dead script code and fix a script comment.