| commit | 16c97e6cfa9d247af3bcb6bfeb68de4d2f77938e | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Aug 08 00:24:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 00:24:33 2015 +0000 |
| tree | 33fb52badb33fc4a5572d2b91e6389d4ce4c5720 | |
| parent | ebeba5bc46106ca3f9e85772391d007798022de6 [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