diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-07-25 22:47:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-25 22:47:17 +0000 |
| commit | 8db381c0a0b5abb85f864b2a41033013c993071b (patch) | |
| tree | eba616763e970ba93366babd00e8acdb69cd10b4 /keystore/java/android/security/KeyChain.java | |
| parent | 1549c28f8ddd00d593d3867d67ba5f73574bba42 (diff) | |
| parent | 56c50d82f2423797660acf0729e9df89b2c8dfe7 (diff) | |
Merge changes I2107c355,I60b5e161 into nyc-mr1-dev-plus-aosp
* changes:
Merge \"QS: Fixup footer + animations\" into nyc-mr1-dev am: 425023fcda
QS: Fixup footer + animations am: df36aed859
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
0 files changed, 0 insertions, 0 deletions