tree 50b3c3044e8a7a7294d7b10889f3143c29f15eb0
parent ff4fcdb98c9575642c48f1daeafff4b257769e81
parent 92f3e9a1fba2873c00d1d89179c051a82e924d76
author Ian Rogers <irogers@google.com> 1361815795 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1361815795 +0000

am 92f3e9a1: am e88c0d9e: Merge "Recognize odex files in memory accounting."

* commit '92f3e9a1fba2873c00d1d89179c051a82e924d76':
  Recognize odex files in memory accounting.