diff options
| author | Marco Nelissen <marcone@google.com> | 2019-10-23 10:12:41 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-23 10:12:41 -0700 |
| commit | e49b490c4ad9562f9a6a07f7b663c7b1ba4bd964 (patch) | |
| tree | c7d80ee5faf51950645d289ef7ff16ffcd05e091 /keystore/java/android/security/Credentials.java | |
| parent | f1f26c2cad842d45c60ae30c752ab86e218b329b (diff) | |
| parent | 047c40807ecc91ce96b6e68441117d31e745fa05 (diff) | |
[automerger skipped] Merge "Move MidiDeviceInfo to libamidi, its only user" am: 7a2fb04c22 am: e399a7f824 am: 72fab3af33
am: 047c40807e -s ours
am skip reason: change_id I16b62ef8288bc68a46ae9ac6318efb95fa469e4f with SHA1 9267280700 is in history
Change-Id: Ifbd9120e171da2f038b04e50e0abfedc590d8a65
Diffstat (limited to 'keystore/java/android/security/Credentials.java')
0 files changed, 0 insertions, 0 deletions