OSDN Git Service

Merge changes Ibfb5c6ab,I712919ae into lmp-mr1-dev
authorPaul Lawrence <paullawrence@google.com>
Tue, 2 Dec 2014 20:17:32 +0000 (20:17 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 2 Dec 2014 20:17:33 +0000 (20:17 +0000)
commit75f304f922dcb27e57dcbea17a36d426f6b223a7
tree107a64e29aa1bde1b5eef61162b94b632c95b65c
parentaffe473213deb4b2d1b9354cc57e2f517840e21a
parentc38182ff3b1ecaf5e7a7270074bbab7f37819d3d
Merge changes Ibfb5c6ab,I712919ae into lmp-mr1-dev

* changes:
  Add mechanism for securely returning parameters though NativeDaemonConnector
  Revert "DO NOT MERGE: Don't log passwords returned from vdc"