| commit | 5cb89c74454ba33f99b8324ab35d25924c4e6897 | [log] [tgz] |
|---|---|---|
| author | Yohann Roussel <[email protected]> | Thu May 21 10:18:28 2015 +0000 |
| committer | Android Git Automerger <[email protected]> | Thu May 21 10:18:28 2015 +0000 |
| tree | 7735ae0b5c4d0453a44bd01665653c2d67b36dfe | |
| parent | 24b8aabdb256acaa0af72c799679bd87a6f7838e [diff] | |
| parent | 12b2e7c40fac731976075ecc35ac5bb8bd6f7d4f [diff] |
am 12b2e7c4: (-s ours) am 1d8b17ac: (-s ours) am 2db531ee: (-s ours) Merge "[DO NOT MERGE] Allow compilation with Jack." * commit '12b2e7c40fac731976075ecc35ac5bb8bd6f7d4f': [DO NOT MERGE] Allow compilation with Jack.