commit | a683aa262314b03b39e613d6e87b31e028edda47 | [log] [tgz] |
---|---|---|
author | Clay Murphy <claym@google.com> | Thu Oct 16 16:40:24 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 16 16:40:24 2014 +0000 |
tree | f299c8b43ecef443d0c9c4833571655e5bb05e7a | |
parent | 3c1f3c315fc4e16649e04433c9b149629d97835d [diff] | |
parent | 55f9dea8336d82714d6b4f88498e37e48736c38b [diff] |
am 55f9dea8: Merge "Docs: Updating the encryption page for L" into lmp-dev * commit '55f9dea8336d82714d6b4f88498e37e48736c38b': Docs: Updating the encryption page for L