| commit | 21def9a0a54a7204909dcc32abd912d38afdcfb9 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Fri Dec 19 04:24:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 19 04:24:04 2014 +0000 |
| tree | 6ee6fc10db0944ea1c85a36e23a330a598ec274f | |
| parent | 68047ffd4327bf5695ebf26833c3e2f40a3dfbd3 [diff] | |
| parent | 42740668423d6cd9d0a3b406c3e5c160dbbdabca [diff] |
am 42740668: (-s ours) Merge "Installd: Swap file for dex2oat" into lmp-mr1-dev * commit '42740668423d6cd9d0a3b406c3e5c160dbbdabca': Installd: Swap file for dex2oat