| commit | 1b756930a29d6c52305812b3da5ce5f0d2765f38 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed Oct 15 00:22:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 15 00:22:43 2014 +0000 |
| tree | 6aabc393505810a9c1bc36bb31e3630f57c0355f | |
| parent | e86ee5e707cb32d5cde4c879754c6084e4a38151 [diff] | |
| parent | a8abcb365b8ea94c7672b09e851488d9454135ba [diff] |
am a8abcb36: resolved conflicts for merge of 852fc3e6 to lmp-mr1-dev-plus-aosp * commit 'a8abcb365b8ea94c7672b09e851488d9454135ba': Link compiler-rt in the correct order.