| commit | 8536d6cfe9952415a2186011b6cebfb7d2c0ee91 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Fri Oct 17 21:08:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 17 21:08:11 2014 +0000 |
| tree | 54df9c374dfa660b117a530a2b858dd980d01157 | |
| parent | 5c467bc615e1a7553d05c361cd7fd7ac8cc4c0cb [diff] | |
| parent | 06a314d65ad1583e76394d6c5846e3bbfd8eedcb [diff] |
am 06a314d6: am e52c159c: Fix some strings for the encryption stuff. * commit '06a314d65ad1583e76394d6c5846e3bbfd8eedcb': Fix some strings for the encryption stuff.