| commit | d1ef4362bf799f9f5d50e5edef8433664b503051 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Nov 12 11:49:06 2015 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Thu Nov 12 11:52:42 2015 +0000 |
| tree | 59aaa140925efa790f787d5e1caf6d0cafd6ae15 | |
| parent | e4cf5892c2a244034900d49499c071b255571bba [diff] | |
| parent | f32e8327da5dd33abe18662fbca5e584cd047816 [diff] |
Merge lmp changes into mnc. Most merge conflicts are due to changes in the string representation. They have been resolved in favour of "mnc-dev" since we've changed the string representation there. Other changes relate to the fact that there are now two jars in libcore (core-oj and core-libart). Change-Id: I1fcc6e5f8dab8d1954dcddca0493563e7677d433