summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2015-01-09 20:20:01 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-09 20:20:01 +0000
commitf3ac99f2e093f851ca52bcd5aefb251046db10fa (patch)
tree5326f07d206902010df580c2515163f1283084fe /core/jni
parentd6a8c32a6a2ac07f25f65622366ccb4ccffbdcdd (diff)
parent68dabada9e6e380ec0c6dacbc2ce7a46aa663a07 (diff)
downloadframeworks_base-f3ac99f2e093f851ca52bcd5aefb251046db10fa.zip
frameworks_base-f3ac99f2e093f851ca52bcd5aefb251046db10fa.tar.gz
frameworks_base-f3ac99f2e093f851ca52bcd5aefb251046db10fa.tar.bz2
am a97fe138: Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev
automerge: 68dabad * commit '68dabada9e6e380ec0c6dacbc2ce7a46aa663a07': Exclude ephemeral networks from wifi backup
Diffstat (limited to 'core/jni')
0 files changed, 0 insertions, 0 deletions