am bc7cb7d9: resolved conflicts for merge of 5e69741e to klp-modular-dev

Browse Source

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

...

This commit is contained in:

Nick Kralevich

2015-08-07 21:12:20 +00:00

committed by Android Git Automerger

parent ac7b67f7b9 bc7cb7d92a

commit c5066d81a8

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