summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Makoto Onuki <omakoto@google.com> 2015-06-29 17:14:17 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-06-29 17:14:17 +0000
commitc561497116bd336160a33839650d11cad14d7dc9 (patch)
tree60a46156539c131f5c136e35c7c7d63c98906fb9 /libs/androidfw/ZipFileRO.cpp
parentea8f842fb83cfbc9410da685ee7726bc1a425ee5 (diff)
parent08dfa1b45633d55da2d3da045f076dc4a6b4d58a (diff)
am 08dfa1b4: am cadf3969: Merge "Notification for non-adopotable disks shouldn\'t be snoozed" into mnc-dev
* commit '08dfa1b45633d55da2d3da045f076dc4a6b4d58a': Notification for non-adopotable disks shouldn't be snoozed
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions