tree 26a4e6cac6d70820302821d3327d725b2ca2e73a
parent 5bf3bb5ab8be76972bce3f679631869e67185295
parent 9d641c41db732c4e9e7a5dac074197f1a9d40bcc
author Michael Runge <mrunge@google.com> 1413438737 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413438737 +0000

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

* commit '9d641c41db732c4e9e7a5dac074197f1a9d40bcc':
  Fix public/private key options on sign_target_files_apks