| commit | e0e8223c10e051b73fdcbed4fc67a69df2655c56 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Thu Nov 06 02:39:17 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 06 02:39:17 2014 +0000 |
| tree | 1bbf6047da0636dddcac32a904d55c2cd87d2ba0 | |
| parent | 7ed62fb4a7401adc3e8b4e082bcfa21de443ebbe [diff] | |
| parent | 1cf9ad1abb599ce4057189e0db154cf00b4913f8 [diff] |
am 1cf9ad1a: Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-dev * commit '1cf9ad1abb599ce4057189e0db154cf00b4913f8': Pass resolution to Crypto plugin on format change