OSDN Git Service

Merge "FRP: Add config flag for disabling credential FRP" into oc-mr1-dev
authorAdrian Roos <roosa@google.com>
Mon, 25 Sep 2017 18:38:23 +0000 (18:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Sep 2017 18:38:23 +0000 (18:38 +0000)
commit392a9b5c1d3b4ae3c684121e3f0292fc95297843
tree1bba827598669a7cd866cd0671e47a6353c4d563
parent9e3d9686a40ae17fa17f43b1bafb5331ebe12e98
parent73c93f02f77e81fdfdbfd7594fc7d7f12c7cf19a
Merge "FRP: Add config flag for disabling credential FRP" into oc-mr1-dev
am: 73c93f02f7

Change-Id: I647bfc52892b305eb59f446812e142b609172bd4
core/res/res/values/config.xml
core/res/res/values/symbols.xml