commit | ea9fe7e5de39c815d638d1f1daeeec359f236274 | [log] [tgz] |
---|---|---|
author | Konstantinos Menychtas <kmenychtas@google.com> | Fri Aug 07 23:18:45 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 07 23:18:45 2015 +0000 |
tree | b6e50972eba1887977fdcfa0a665469e9a359df9 | |
parent | c631e5b27662d268aef1986bc5e459471c3b6e86 [diff] | |
parent | 0f528e4f0d172a4efaf9f7d7257b86dc34b3521d [diff] |
am 0f528e4f: am 14c5da2f: resolved conflicts for merge of bbb03147 to lmp-mr1-dev * commit '0f528e4f0d172a4efaf9f7d7257b86dc34b3521d': DO NOT MERGE Increase the system-image revision number after opengl bug fix