| commit | 443cb20b45a297d987645c3ad5ac1759c1855294 | [log] [tgz] |
|---|---|---|
| author | Calin Juravle <calin@google.com> | Wed Oct 29 17:48:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 17:48:05 2014 +0000 |
| tree | 23a5b93a70a10791e0b8a82d1d9ef8478702d2c0 | |
| parent | 013a2125432a12ff870354fb1e98f358d9521e63 [diff] | |
| parent | 83c29aea2f72d10fd2ba027a239f8b4edf8c23c8 [diff] |
am 83c29aea: resolved conflicts for merge of 4de4e6de to lmp-mr1-dev-plus-aosp * commit '83c29aea2f72d10fd2ba027a239f8b4edf8c23c8': Handle code_cache dir creation in libnativebridge