tree 0958e6e74b149a9fc4b1aac08baae6161cf49829
parent 14799fb52105915a2e3164e2139b9504f509211d
parent 913bdde19a104ac14fdffebf2e3c32982c6383a6
author Martijn Coenen <maco@google.com> 1384373244 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384373244 -0800

am 913bdde1: Merge "Enable "PASS" button on proto params reader." into klp-dev

* commit '913bdde19a104ac14fdffebf2e3c32982c6383a6':
  Enable "PASS" button on proto params reader.