| commit | c4ad3cb07ed76c5697c60285456d9c49675174d9 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Mon Apr 08 23:39:29 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Apr 08 23:39:29 2013 +0000 |
| tree | 3eb0fa618bc21df3ff96f084ad4491755e8d360e | |
| parent | 0eee410e473c1546af80c63ec866655a28833f33 [diff] | |
| parent | e20a6d5c479909f37af748a81a6e5a5deb7b6e2c [diff] |
Merge "Add support for common encryption" into jb-mr2-dev