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