OSDN Git Service

Merge "DISALLOW_CONFIG_CREDENTIALS blocks user credentials" into nyc-dev
authorRobin Lee <rgl@google.com>
Thu, 31 Mar 2016 18:55:32 +0000 (18:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 Mar 2016 18:55:32 +0000 (18:55 +0000)
commite79fed2839bbb70c1df111947208e00833057154
tree274a949928b20607632726ed21b9129da3c19df7
parentf3a5f7986d41f126d6589296b207285247fb4f8e
parent4d29ab31455ae7c7eef91871230e34b3ecc452e1
Merge "DISALLOW_CONFIG_CREDENTIALS blocks user credentials" into nyc-dev
am: 4d29ab3

* commit '4d29ab31455ae7c7eef91871230e34b3ecc452e1':
  DISALLOW_CONFIG_CREDENTIALS blocks user credentials

Change-Id: I20a82efa39f5116ba3919198418873e794fa5240