tree 6993687d0c39d4fe3303d40166c0ad7450e9e969
parent d51b61e16e699a4ed29644d5d58c98e652b3e403
parent 30238da1f5ff68a264c9980c9d45ffba10424ee2
author Guang Zhu <guangzhu@google.com> 1274232935 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274232935 -0700

am 984680ba: Merge "disable emma instrumentation for framework, ext and services (DO NOT MERGE)" into kraken