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

Browse Source

* commit '1d8b17ac6e9c92c79d8e33e4d89b8e75f4a3e347':
  [DO NOT MERGE] Allow compilation with Jack.

...

This commit is contained in:

Yohann Roussel

2015-05-21 10:02:06 +00:00

committed by Android Git Automerger

parent 9d80c98aff 1d8b17ac6e

commit 12b2e7c40f

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