| commit | b9fd12ac53a35800753d54c4c0a825c261267c29 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Jan 31 15:12:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 31 15:12:34 2014 +0000 |
| tree | 1009727e9d12a2d5f319295bb61a0074deba24e6 | |
| parent | 3a5e470553a1a42647850b7c642f96961c2e4587 [diff] | |
| parent | dfd1aa4331b8ab452d7baf4fdf8cf0cd36c67ddd [diff] |
am dfd1aa43: resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aosp * commit 'dfd1aa4331b8ab452d7baf4fdf8cf0cd36c67ddd': frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default