summaryrefslogtreecommitdiffstats
path: root/packages/VpnDialogs/res
diff options
context:
space:
mode:
authorDiego Pontoriero <diegs@google.com>2014-08-21 04:08:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-21 04:08:51 +0000
commit561f7f438352f70fbefb9c7606269162527e7fe5 (patch)
tree066465d168a1575f2a7a112403b9237a4aca168c /packages/VpnDialogs/res
parentb818431016422e7b4f5e147030794f652f15babe (diff)
parent2d21ec47ca46b2c037278afe4558b405a0eed63c (diff)
downloadframeworks_base-561f7f438352f70fbefb9c7606269162527e7fe5.zip
frameworks_base-561f7f438352f70fbefb9c7606269162527e7fe5.tar.gz
frameworks_base-561f7f438352f70fbefb9c7606269162527e7fe5.tar.bz2
am d0cf89eb: am 744a16e4: am dede6854: Merge "Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC." into lmp-dev
* commit 'd0cf89eb08c2839fa2609e59b932923076b6aca3': Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC.
Diffstat (limited to 'packages/VpnDialogs/res')
0 files changed, 0 insertions, 0 deletions