| commit | b07478d7f6543d65ee6864ccb66a220fb8a17d38 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Aug 08 00:04:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 00:04:27 2015 +0000 |
| tree | f3d1f99c00762b8299d8c6fc1681156eea88ee44 | |
| parent | 3ab6703be870793fd9433a932dc553342942de9f [diff] | |
| parent | c1925e98309b14a2378b14a3ca9c4cff0225b862 [diff] |
am c1925e98: am dd48de4d: am 163341ca: am 89e5f5c1: am c5066d81: am bc7cb7d9: resolved conflicts for merge of 5e69741e to klp-modular-dev * commit 'c1925e98309b14a2378b14a3ca9c4cff0225b862': DO NOT MERGE Increase the system-image revision number after opengl bug fix