| commit | 944f3112a6d3fca7c70602e9696508101385e57c | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Thu Nov 06 02:55:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 06 02:55:01 2014 +0000 |
| tree | 02a3145700c49cf1c47a8c08dddf0de8a56f8179 | |
| parent | 3db4166958f30d64ef57e7768420b4af6d226d4a [diff] | |
| parent | 6e0da0226503ddea118d43962a76fa2fa56bad1e [diff] |
am 6e0da022: am e0e8223c: am 1cf9ad1a: Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-dev * commit '6e0da0226503ddea118d43962a76fa2fa56bad1e': Pass resolution to Crypto plugin on format change