summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2013-05-08 15:03:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-08 15:03:54 -0700
commita0e780edd3dc10cb4110689642e2380b72906712 (patch)
tree6847bd8ef62205a3ffde9d09cd822c3b2e1a7c67 /init
parent1a8bb3e815629d603886b8f7f6842bd69b559a8f (diff)
parent6e46a3b8e64a7a2ca4754ed7b1f9922719bd0a9b (diff)
downloadsystem_core-a0e780edd3dc10cb4110689642e2380b72906712.zip
system_core-a0e780edd3dc10cb4110689642e2380b72906712.tar.gz
system_core-a0e780edd3dc10cb4110689642e2380b72906712.tar.bz2
am 6e46a3b8: am a1ee12ca: Merge "libcutils: add a trace tag for Dalvik" into jb-mr2-dev
* commit '6e46a3b8e64a7a2ca4754ed7b1f9922719bd0a9b': libcutils: add a trace tag for Dalvik
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions