| commit | 31deee5e307c00245d0fc7fd09dfe299145e1e0c | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Fri Oct 24 21:10:27 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 24 21:10:27 2014 +0000 |
| tree | f74c67b138d19d4bb54780e23f20a385a6edbf34 | |
| parent | 4329ad3be8f42b62f54ab070fcd97d2a1bb2d7f3 [diff] | |
| parent | e20dd304b74c7479e1471780e985416902a9b9e9 [diff] |
am c220d8e5: Stop crypto UI from crashing during encryption automerge: 0e6178b automerge: e20dd30 * commit 'e20dd304b74c7479e1471780e985416902a9b9e9': Stop crypto UI from crashing during encryption