| commit | 3ab6703be870793fd9433a932dc553342942de9f | [log] [tgz] |
|---|---|---|
| author | Konstantinos Menychtas <kmenychtas@google.com> | Sat Aug 08 00:04:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 00:04:25 2015 +0000 |
| tree | f3d1f99c00762b8299d8c6fc1681156eea88ee44 | |
| parent | 28aafa0d6708584bb00a108577634aab034961a5 [diff] | |
| parent | ea9fe7e5de39c815d638d1f1daeeec359f236274 [diff] |
am ea9fe7e5: (-s ours) am 0f528e4f: am 14c5da2f: resolved conflicts for merge of bbb03147 to lmp-mr1-dev * commit 'ea9fe7e5de39c815d638d1f1daeeec359f236274': DO NOT MERGE Increase the system-image revision number after opengl bug fix