diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-07-25 22:47:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-25 22:47:04 +0000 |
| commit | 1549c28f8ddd00d593d3867d67ba5f73574bba42 (patch) | |
| tree | 432754a3118aa4de2bfdde7307f529f2389fc59b /keystore/java/android/security/KeyChain.java | |
| parent | b27502cfa8a3c87ec99a1130a1c5ec2c8aa7e52e (diff) | |
| parent | 358ea1cc0f68231fd6c334ac57685b919b254583 (diff) | |
Merge changes I5a1e9d04,Ic6f20e06 into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Don\'t reset layout params when repositioning\" into nyc-mr1-dev am: 961492cc30
Don\'t reset layout params when repositioning am: 90dfb89916
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
0 files changed, 0 insertions, 0 deletions