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