tree 6a7b0ff41ccaf477a24f79659788850dab1eb0a2
parent ae05942dd8d8bd001ef6b73b398b1d96ee34bc29
parent 27f9b5dde6f2211003be3925d63deed638d45360
author Elliott Hughes <enh@google.com> 1363908955 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363908955 -0700

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

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