| commit | ebeba5bc46106ca3f9e85772391d007798022de6 | [log] [tgz] |
|---|---|---|
| author | Konstantinos Menychtas <kmenychtas@google.com> | Sat Aug 08 00:24:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 00:24:31 2015 +0000 |
| tree | 33fb52badb33fc4a5572d2b91e6389d4ce4c5720 | |
| parent | e37e26a40ac32e4a478077986b5dddf12efbac9c [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