tree a1a724fff2289d60ffe60a9a3e37a8223a5f0d51
parent 5494df2d1504b21fef24e1533ab5703b147dfdfa
parent 1eb7a595abaf8418ae33c7067e39580b8fb3f067
author Michael Runge <mrunge@google.com> 1413443148 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413443148 +0000

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

* commit '1eb7a595abaf8418ae33c7067e39580b8fb3f067':
  Fix public/private key options on sign_target_files_apks