tree 5d843d90669691afbc51b62292fc9c7098263822
parent d073f73994dd8fd575a276939834f72d9257bce5
parent 4a4dc5f313953764079a4020a3791e36ec43ba0c
author Riley Andrews <riandrews@google.com> 1439422120 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439422120 +0000

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

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