summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2010-02-18 11:02:48 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-18 11:02:48 -0800
commit6a6588b4acada94fd36908c6bf16bc32c7c0a252 (patch)
tree15b8f7f8c800a7d76652d5d1883aecf2995f8413 /tools/aapt2/diff/Diff.cpp
parentf59a3c14c1d2ad701a842c1b66fa14e2d022c313 (diff)
parent6371a2d31f30b473e91be9cced64a2527c086af1 (diff)
am 6371a2d3: am ee3bbefd: Merge "Don\'t crash the system process when apps give us a bad foreground service notification." into eclair
Merge commit '6371a2d31f30b473e91be9cced64a2527c086af1' * commit '6371a2d31f30b473e91be9cced64a2527c086af1': Don't crash the system process when apps give us a bad foreground service notification.
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions