| commit | e76fc7ca5a1de021ef70d89761260b886ba18741 | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Wed Sep 07 12:44:22 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 07 12:44:22 2016 +0000 |
| tree | 513df037735cb9f83e3e5c5cbb060d025c2f3863 | |
| parent | cd7448e1970aede11d96b1de3dae187f50061794 [diff] | |
| parent | f0efc8fc28620b1f298c3144572c60a2598e95a8 [diff] |
Merge "java.security.PKCS12Attribute: port class from jdk8u60" am: 6767fd28b1 am: 52e0434748 am: 724155a3be am: f0efc8fc28 Change-Id: I04dcfe65ce91145c1cf8c2a13124235916a2d38d