| commit | 3432fe1c371b4598b4abe215ca9aa44da2d68450 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Mon Sep 29 22:26:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 29 22:26:43 2014 +0000 |
| tree | 4af2103c3d3cd3ea52bc7c7884c876a9bfc373c2 | |
| parent | 74903503f988d7d24840f74fe05a48ee2d72d28e [diff] | |
| parent | 0c3436e069254b11af13c4da87a72cdc343e4c7f [diff] |
am 0c3436e0: am f0699c11: am 68c19686: Merge "Fix mac build for nativebridge tests." * commit '0c3436e069254b11af13c4da87a72cdc343e4c7f': Fix mac build for nativebridge tests.