am 12b2e7c4: (-s ours) am 1d8b17ac: (-s ours) am 2db531ee: (-s ours) Merge "[DO NOT MERGE] Allow compilation with Jack."

Browse Source

* commit '12b2e7c40fac731976075ecc35ac5bb8bd6f7d4f':
  [DO NOT MERGE] Allow compilation with Jack.

...

This commit is contained in:

Yohann Roussel

2015-05-21 10:18:28 +00:00

committed by Android Git Automerger

parent 24b8aabdb2 12b2e7c40f

commit 5cb89c7445

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available