summaryrefslogtreecommitdiffstats
path: root/core/java/android/net
diff options
context:
space:
mode:
authorChad Brubaker <cbrubaker@google.com>2015-04-29 17:32:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-29 17:32:27 +0000
commitfb5caad6d71c1ed0c2ea7065f5bc650822d70e16 (patch)
tree9378b533670f7d48fe4fa99dbac1b32d24af21d8 /core/java/android/net
parentd2d8f27ab9e0bb13f7aab4929e2ff4a8b547fdde (diff)
parent721474bb9cfb76e29e0fe6e98c6b582c6fa78fe4 (diff)
downloadframeworks_base-fb5caad6d71c1ed0c2ea7065f5bc650822d70e16.zip
frameworks_base-fb5caad6d71c1ed0c2ea7065f5bc650822d70e16.tar.gz
frameworks_base-fb5caad6d71c1ed0c2ea7065f5bc650822d70e16.tar.bz2
am 721474bb: Merge "Add OP_AUTH_NEEDED KeyStore result code" into mnc-dev
* commit '721474bb9cfb76e29e0fe6e98c6b582c6fa78fe4': Add OP_AUTH_NEEDED KeyStore result code
Diffstat (limited to 'core/java/android/net')
0 files changed, 0 insertions, 0 deletions