summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorPaul Jensen <pauljensen@google.com>2014-11-26 12:08:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-26 12:08:47 +0000
commit58a493accfeafa13fd77a16e832c5ad72a4c9006 (patch)
treef69270db657e7b818895390d1b4a160854af3b69 /policy
parent3052fede8860724a225b49c31ffbb0aa3fd4707b (diff)
parentbe3736d38774210549deb2999bb226d83a29f1ee (diff)
downloadframeworks_base-58a493accfeafa13fd77a16e832c5ad72a4c9006.zip
frameworks_base-58a493accfeafa13fd77a16e832c5ad72a4c9006.tar.gz
frameworks_base-58a493accfeafa13fd77a16e832c5ad72a4c9006.tar.bz2
am be3736d3: Merge "Don\'t let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev
* commit 'be3736d38774210549deb2999bb226d83a29f1ee': Don't let NetworkMonitor state stop user-initiated transitions.
Diffstat (limited to 'policy')
0 files changed, 0 insertions, 0 deletions