tree 1e2d6d1fd76bd9c396236c5effc9536ce9164b1e
parent 233a905d9f2b6e05eb583882ca298d02b2d324a1
parent da133d84ccae98b40116b1318d3d3544de2b5900
author Stuart Scott <stuartscott@google.com> 1382749805 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382749805 -0700

am da133d84: Cleaning Manifest and re-adding systrace.

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