summaryrefslogtreecommitdiffstats
path: root/packages/CaptivePortalLogin
diff options
context:
space:
mode:
authorRichard Uhler <ruhler@google.com>2015-06-09 16:59:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-09 16:59:29 +0000
commitd58abdd12f79bebad894ea54973ef57061e7dc15 (patch)
treefb4b66b523651e9d7ecdbf3c504ddfbd6c090345 /packages/CaptivePortalLogin
parent6ca311ca99bc1290d714c6918e57db6daef7a941 (diff)
parent659716d7a03553006e67b01008c2e9e03a20ed31 (diff)
downloadframeworks_base-d58abdd12f79bebad894ea54973ef57061e7dc15.zip
frameworks_base-d58abdd12f79bebad894ea54973ef57061e7dc15.tar.gz
frameworks_base-d58abdd12f79bebad894ea54973ef57061e7dc15.tar.bz2
am 659716d7: Merge "Add Debug.MemoryInfo.getMemoryStats API." into mnc-dev
* commit '659716d7a03553006e67b01008c2e9e03a20ed31': Add Debug.MemoryInfo.getMemoryStats API.
Diffstat (limited to 'packages/CaptivePortalLogin')
0 files changed, 0 insertions, 0 deletions