summaryrefslogtreecommitdiff
path: root/tools/aidl/aidl.cpp
diff options
context:
space:
mode:
author Winson Chung <winsonc@google.com> 2014-10-01 22:23:20 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-10-01 22:23:20 +0000
commit983917288d1d6ea0ade9229740ea5bac0b8b2887 (patch)
tree21b23778ed67a42edfee3630daa839d25fa27b82 /tools/aidl/aidl.cpp
parentdc12e1092e7216a9ed9295afc2fd3f235c2367bb (diff)
parent0dad6a0732633a11fa780135c3c1f52defac9f16 (diff)
am 0dad6a07: am d8ab73d7: am d092fc70: Merge "Ensure that we don\'t show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition
* commit '0dad6a0732633a11fa780135c3c1f52defac9f16': Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode option
Diffstat (limited to 'tools/aidl/aidl.cpp')
0 files changed, 0 insertions, 0 deletions