| commit | c1925e98309b14a2378b14a3ca9c4cff0225b862 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Aug 07 23:18:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 07 23:18:52 2015 +0000 |
| tree | b6e50972eba1887977fdcfa0a665469e9a359df9 | |
| parent | ea9fe7e5de39c815d638d1f1daeeec359f236274 [diff] | |
| parent | dd48de4dfe4a449da162dd20294e47ca7e4989f5 [diff] |
am dd48de4d: am 163341ca: am 89e5f5c1: am c5066d81: am bc7cb7d9: resolved conflicts for merge of 5e69741e to klp-modular-dev * commit 'dd48de4dfe4a449da162dd20294e47ca7e4989f5': DO NOT MERGE Increase the system-image revision number after opengl bug fix