diff options
| author | Etan Cohen <etancohen@google.com> | 2016-11-07 23:40:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-07 23:40:35 +0000 |
| commit | 5f9b3d834b9d2d9b72ce459cba210bfe5b546b54 (patch) | |
| tree | 58d09a6c38c70bc4dbfaefa3ae424a06bffc91e2 /keystore/java/android/security/KeyChain.java | |
| parent | e327563c6ca37a612445255064c969c5e2692ce5 (diff) | |
| parent | 60e673410090316e515dcd3e7abcfcede5232adb (diff) | |
Merge "[AWARE] Fix visibility of Aware Characteristics API" am: 13c76b77dc
am: 60e6734100
Change-Id: I6e2b1496d2868787d7173ed239f8b6b6081b0d99
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
0 files changed, 0 insertions, 0 deletions