tree d1b5855bde70b33d4acc2b5ecf0c89a8e9dfaf7e
parent bfcef089ac7ffb4446a6796579fc4003a9592f96
parent 92946baa035ee9376478185fbd74849730d20768
author Michael Runge <mrunge@google.com> 1413442825 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413442825 +0000

am 92946baa: am 9d641c41: Merge "Fix public/private key options on sign_target_files_apks" into lmp-dev

* commit '92946baa035ee9376478185fbd74849730d20768':
  Fix public/private key options on sign_target_files_apks