tree c77acd6fb6180f5aab7459689a28796d6ed82bd8
parent 17d1a9afa97c7e91524f28fcdd6c956b6459f22e
parent deacff1b5c84d38431df836bf00b316e554fb96e
author Elliott Hughes <enh@google.com> 1363909093 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363909093 -0700

am deacff1b: am 27f9b5dd: Merge "Revert "Fix Manifest behavior with Manifest-Version/Signature-Version.""

* commit 'deacff1b5c84d38431df836bf00b316e554fb96e':
  Revert "Fix Manifest behavior with Manifest-Version/Signature-Version."