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