| commit | afc625a6799ad0619bd233fc0383fa2a3d6acb8d | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Aug 07 14:09:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 07 14:09:33 2014 +0000 |
| tree | cec0b76d3f0dc611c90c6ab1d00a95561d7a32ef | |
| parent | 5576e855bf6339a6caf8cdff7414616a4d41bfab [diff] | |
| parent | 692d041f0c98c19ed0ebc26bfb2567e9f82f4203 [diff] |
am 06407eb4: am 4902e5ff: am ae9b5cd0: Merge "Pass initiatedByUser to TrustListeners" into lmp-dev * commit '06407eb441b71d0dd62f38cef72aba140944b711': Pass initiatedByUser to TrustListeners