tree 597ae5de646e9732c0950c4d41cfd726e4c61c75
parent 6bf2b78e7083743f3e46ccba530e51a376b86afd
parent 14c5da2f86fd8c59f961e6675eeeb4af299a0e18
author Konstantinos Menychtas <kmenychtas@google.com> 1438989195 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438989195 +0000

am 14c5da2f: resolved conflicts for merge of bbb03147 to lmp-mr1-dev

* commit '14c5da2f86fd8c59f961e6675eeeb4af299a0e18':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix