tree b6e7ad8f832f7023cea22aa49986fd258643038d
parent b8c0224d18b78b388c7394c43c68b83449a76819
parent 8e9b03f9b26f75e1293cac9e658983d2d4a6d963
author Stuart Scott <stuartscott@google.com> 1382750059 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382750059 -0700

am 8e9b03f9: am da133d84: Cleaning Manifest and re-adding systrace.

* commit '8e9b03f9b26f75e1293cac9e658983d2d4a6d963':
  Cleaning Manifest and re-adding systrace.