am ea9fe7e5: (-s ours) am 0f528e4f: am 14c5da2f: resolved conflicts for merge of bbb03147 to lmp-mr1-dev

Browse Source

* commit 'ea9fe7e5de39c815d638d1f1daeeec359f236274':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix

...

This commit is contained in:

Konstantinos Menychtas

2015-08-08 00:04:25 +00:00

committed by Android Git Automerger

parent 28aafa0d67 ea9fe7e5de

commit 3ab6703be8

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