tree ad9c12fd563c245957cf460d8e4c7c1febc1bf4a
parent 2a3e8c729d2e5c166775d6810346406b4fcc2eb0
parent b8794c76d677ef04c96b9edc002fe6e1f53022c7
author Chad Brubaker <cbrubaker@google.com> 1421293512 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421293512 +0000

am b8794c76: Merge "resolved conflicts for merge of 3d64a850 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp

* commit 'b8794c76d677ef04c96b9edc002fe6e1f53022c7':
  Generate IKeystoreService using aidl