tree 3f6150fbf5547ceb51749b3bea185341d7544563
parent 7c38f53d1911e04acf6398921a7bd4444d585c2b
parent afab5a703d30df613848cb30ab3ecceafd76102b
author Jean-Baptiste Queru <jbq@google.com> 1330571329 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330571329 -0800

am afab5a70: Merge "Eliminate duplicate constants"

* commit 'afab5a703d30df613848cb30ab3ecceafd76102b':
  Eliminate duplicate constants