tree 09f4f5556d6a78e769973fd67c29fd4151872895
parent 751afe2040a1954826f550c0fdc2c1f148fe21eb
parent e4c58e46419bdc1cbe94516bdded71f017534d9c
author Jim Miller <jaggies@google.com> 1433888859 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1433888860 +0000

Merge "Add documentation for possible AndroidKeyStore exceptions to authenticate() call" into mnc-dev