| commit | a680a0ca52d252c3a420c4e31752afe12ebbe81c | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Sat Apr 18 18:57:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Apr 18 18:57:36 2015 +0000 |
| tree | 33314be0482e4c07f3e60a6db63fe685ece888fd | |
| parent | 8e6b64cb30309a61730523c5dd6428aae763a73b [diff] | |
| parent | 57a72ec80b8c5a6646c1e510492c60f2e985d09a [diff] |
am 57a72ec8: am 3ad91aa7: Merge "keystore-engine: comment out unused args" * commit '57a72ec80b8c5a6646c1e510492c60f2e985d09a': keystore-engine: comment out unused args