summaryrefslogtreecommitdiffstats
path: root/packages/DocumentsUI
diff options
context:
space:
mode:
authorXiaohui Chen <xiaohuic@google.com>2015-06-18 00:02:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-18 00:02:53 +0000
commit82422c313e5efc80c917afdcf532d6616fbc2313 (patch)
tree2a534e45d3a6cef92305e269fc2ffec6dd517d75 /packages/DocumentsUI
parentb2a0b76da414e7866b319c6ca37b9618a3c4ff8b (diff)
parent802ece61399e94bbe98cafaa277c71bee73c03ba (diff)
downloadframeworks_base-82422c313e5efc80c917afdcf532d6616fbc2313.zip
frameworks_base-82422c313e5efc80c917afdcf532d6616fbc2313.tar.gz
frameworks_base-82422c313e5efc80c917afdcf532d6616fbc2313.tar.bz2
am 802ece61: Merge "system_server: add two child chains to firewall" into mnc-dev
* commit '802ece61399e94bbe98cafaa277c71bee73c03ba': system_server: add two child chains to firewall
Diffstat (limited to 'packages/DocumentsUI')
0 files changed, 0 insertions, 0 deletions