| commit | 12b2e7c40fac731976075ecc35ac5bb8bd6f7d4f | [log] [tgz] |
|---|---|---|
| author | Yohann Roussel <[email protected]> | Thu May 21 10:02:06 2015 +0000 |
| committer | Android Git Automerger <[email protected]> | Thu May 21 10:02:06 2015 +0000 |
| tree | deb2c647a1a7e29f2d85f76cc8bacb6f7db29b01 | |
| parent | 9d80c98affe870ad168aa972aca4418d6f9ac776 [diff] | |
| parent | 1d8b17ac6e9c92c79d8e33e4d89b8e75f4a3e347 [diff] |
am 1d8b17ac: (-s ours) am 2db531ee: (-s ours) Merge "[DO NOT MERGE] Allow compilation with Jack." * commit '1d8b17ac6e9c92c79d8e33e4d89b8e75f4a3e347': [DO NOT MERGE] Allow compilation with Jack.