Adrian Roos 692d041f0c am 4902e5ff: am ae9b5cd0: Merge "Pass initiatedByUser to TrustListeners" into lmp-dev ...

* commit '4902e5ff1cbefa3b2e8a07b434873344a45b21d3':
  Pass initiatedByUser to TrustListeners

2014-08-07 14:04:25 +00:00

..

java/com/android/server

am 4902e5ff: am ae9b5cd0: Merge "Pass initiatedByUser to TrustListeners" into lmp-dev

2014-08-07 14:04:25 +00:00

jni

…

Android.mk

…