summaryrefslogtreecommitdiffstats
path: root/rs/jni
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-08-18 19:48:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-18 19:48:26 +0000
commitc97de79ad268fdc867b618c4a91dc76ce9b61e2b (patch)
treee275e0c3217af0d4ea597b37da836a9f3c688000 /rs/jni
parent162b40e4f9584a61aa74a651e3918c1b5c195fb8 (diff)
parent400ec1b938ddc8da367c594105bfaa7485c80564 (diff)
downloadframeworks_base-c97de79ad268fdc867b618c4a91dc76ce9b61e2b.zip
frameworks_base-c97de79ad268fdc867b618c4a91dc76ce9b61e2b.tar.gz
frameworks_base-c97de79ad268fdc867b618c4a91dc76ce9b61e2b.tar.bz2
am 400ec1b9: am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix"
* commit '400ec1b938ddc8da367c594105bfaa7485c80564': WifiP2pWfdInfo set device type bugfix
Diffstat (limited to 'rs/jni')
0 files changed, 0 insertions, 0 deletions