tree 1e80a716b8acf3b735eb4eb2627d6bca99659a8f
parent 06689433bc9e9d54e01bf4af9526dff2fc3dc862
parent e88c0d9ec374ec4dcca6ccd8d440610ea83622c9
author Ian Rogers <irogers@google.com> 1361815493 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361815493 -0800

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

* commit 'e88c0d9ec374ec4dcca6ccd8d440610ea83622c9':
  Recognize odex files in memory accounting.