| commit | aa0d7f60b6efe093dbf9281ccb89597a421bca1d | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Apr 16 20:31:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 16 20:31:46 2015 +0000 |
| tree | c6c8bc987c34c597ac2b5a64a1a8f6e252ec3b7b | |
| parent | 8fcd5fee60b468c36aee337da0cadad3cd8cf4cd [diff] | |
| parent | b1aa7d0bc821614d943075c0d786cc3f5eeb8c73 [diff] |
am b1aa7d0b: am 51884f0e: am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant." * commit 'b1aa7d0bc821614d943075c0d786cc3f5eeb8c73': Add Keymaster KM_ORIGIN_UNKNOWN constant.