summaryrefslogtreecommitdiff
path: root/tools/aapt/Resource.cpp
diff options
context:
space:
mode:
author Andre Eisenbach <eisenbach@google.com> 2014-12-16 17:27:46 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-12-16 17:27:46 +0000
commit7ea97e28e6a2271fd4d60c07b4fa83e019e3474a (patch)
tree8e8bd2a8e0870984e59a4f52c32a06b25ad7bde3 /tools/aapt/Resource.cpp
parentb8ba4719c1661d30322b7ad360455044a1aa5593 (diff)
parentf6b62a9d913441cb400fc60f3187fc9c1f28dc97 (diff)
am f6b62a9d: am cd460538: Merge "Don\'t send the onServiceDisconnected callback after close." into lmp-mr1-dev
* commit 'f6b62a9d913441cb400fc60f3187fc9c1f28dc97': Don't send the onServiceDisconnected callback after close.
Diffstat (limited to 'tools/aapt/Resource.cpp')
0 files changed, 0 insertions, 0 deletions