tree aa6ba69201baad7793d70431673d904210af7359
parent 6eef56fb7acf78728840210ac104da9cc0d06fc9
parent 4a4dc5f313953764079a4020a3791e36ec43ba0c
author Riley Andrews <riandrews@google.com> 1439421994 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439421994 +0000

am 4a4dc5f3: am a3a193ff: Merge "Added shell permisisons for memreclaim tracing"

* commit '4a4dc5f313953764079a4020a3791e36ec43ba0c':
  Added shell permisisons for memreclaim tracing