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