tree 1b6da94de1d0eba74c12b1eac518c9bda2a8b029
parent 48394b6e85c73211974ef3acad27b85aad22dc8d
parent 97d59c2df3418b1ff6733bb3fd2dc69567cead3b
author Elliott Hughes <enh@google.com> 1363912092 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363912092 -0700

am 97d59c2d: am 48caff24: Merge "Revert "Revert "Fix Manifest behavior with Manifest-Version/Signature-Version."""

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