summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorVinit Deshapnde <vinitd@google.com>2013-10-03 21:27:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-03 21:27:09 -0700
commit78624d61f1a138610bdbffe3d1c6ddf89f3472c8 (patch)
treea83cd7e03291bb11d57538b962d520f52ac9ff6d /Android.mk
parentcf51fefde37b0f786e6abdda700d49091fc36491 (diff)
parent5eb2b0ca76560cb8d707295aec42cb72f379eafe (diff)
downloadframeworks_base-78624d61f1a138610bdbffe3d1c6ddf89f3472c8.zip
frameworks_base-78624d61f1a138610bdbffe3d1c6ddf89f3472c8.tar.gz
frameworks_base-78624d61f1a138610bdbffe3d1c6ddf89f3472c8.tar.bz2
am 5eb2b0ca: Merge "Set P2p statemachine\'s network manager before starting Wifi" into klp-dev
* commit '5eb2b0ca76560cb8d707295aec42cb72f379eafe': Set P2p statemachine's network manager before starting Wifi
Diffstat (limited to 'Android.mk')
0 files changed, 0 insertions, 0 deletions