diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2015-01-15 03:45:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-15 03:45:12 +0000 |
| commit | f038345826c28ebc06948edd63b06d008eee7a1f (patch) | |
| tree | ad9c12fd563c245957cf460d8e4c7c1febc1bf4a /include | |
| parent | 2a3e8c729d2e5c166775d6810346406b4fcc2eb0 (diff) | |
| parent | b8794c76d677ef04c96b9edc002fe6e1f53022c7 (diff) | |
| download | frameworks_base-f038345826c28ebc06948edd63b06d008eee7a1f.zip frameworks_base-f038345826c28ebc06948edd63b06d008eee7a1f.tar.gz frameworks_base-f038345826c28ebc06948edd63b06d008eee7a1f.tar.bz2 | |
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
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions