tree d7aa4f41ca060f2e748a1c0dbe6895a165bdcf13
parent 77bcc98ab2f1d3c9b62ee62c1eb4e3fa87f47967
parent e91c001da9ab9a0c1d9dc8bb12ceef8da0fbe365
author Jean Chalard <jchalard@google.com> 1366804445 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366804445 -0700

am e91c001d: Merge "[PB4] Make a memory non-static"

* commit 'e91c001da9ab9a0c1d9dc8bb12ceef8da0fbe365':
  [PB4] Make a memory non-static