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

Browse Source

* commit '2db531ee1b3a980ea9ee6c7e72ad6d11983500e2':
  [DO NOT MERGE] Allow compilation with Jack.

...

This commit is contained in:

Yohann Roussel

2015-05-21 09:53:38 +00:00

committed by Android Git Automerger

parent d76727637e 2db531ee1b

commit 1d8b17ac6e

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