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