| commit | c414099f459099f5837b935e709cab7ebfca0835 | [log] [tgz] |
|---|---|---|
| author | Yang Ni <yangni@google.com> | Sat Jan 16 01:51:05 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jan 16 01:51:05 2016 +0000 |
| tree | bed531dddf43adde7e07b42693f69ed2686eebf6 | |
| parent | 39334625723d623af10c4a7f7a1bcc6ab6c4d787 [diff] | |
| parent | f414cf774c3c01cd1fc829bde6c6bd463a2d0edc [diff] |
resolve merge conflicts of 70171ef802 to mnc-dr2-dev-plus-aosp. am: e38826d2c0 * commit 'e38826d2c0aad568019cc8c24603eadb1fe7e607': Avoid absolute path loading .so after M