| commit | 393df9231a7828ed46fe90582e3c4402c7bcd7f0 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Tue May 12 17:16:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 12 17:16:14 2015 +0000 |
| tree | 76a45fe9cc5e9d6ea72fa6e5a150654578790432 | |
| parent | 70f1bb5821c0a83cde7a9b2eb6280115a01b040c [diff] | |
| parent | eff9e25320bfe3375d565179db88a05f2a4ee6a9 [diff] |
am eff9e253: am 56b96da7: Merge "Hide @IntDef and @StringDef annotations from AnroidKeyStore API." into mnc-dev * commit 'eff9e25320bfe3375d565179db88a05f2a4ee6a9': Hide @IntDef and @StringDef annotations from AnroidKeyStore API.