tree 939c5ba9957bb708a4402315c16d0d1d63357895
parent 9d360bc0009b1169ac0e4699868ca94d795f393a
parent 43b5d0e259edaaf244dd4948a85b2f1fce3b3f83
author David Turner <digit@android.com> 1302879069 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1302879069 -0700

am 43b5d0e2: am d6ad2a63: am 23a491dc: Merge "emulator opengl: renderControl API encoder/decoder"

* commit '43b5d0e259edaaf244dd4948a85b2f1fce3b3f83':
  emulator opengl: renderControl API encoder/decoder