| commit | b19562f2af4de36d2d5a89e667d7985f1b3e2d72 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Thu Nov 21 22:59:54 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 21 22:59:54 2013 -0800 |
| tree | 17ea8629c5fc9d01048233cb8c5a712c23f58600 | |
| parent | 1b94a03284977c5c09df874ad8169439af57e3c2 [diff] | |
| parent | 0bdc9f08a3b1cb39bb306a20153be3379e69dc4b [diff] |
am 0bdc9f08: resolved conflicts for merge of ee32438e to klp-dev-plus-aosp * commit '0bdc9f08a3b1cb39bb306a20153be3379e69dc4b': Fix naming to match the libart equivalent.