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