OSDN Git Service

am 955470ed: am 3bf12050: am 7f721057: (-s ours) resolved conflicts for merge of...
authorbohu <bohu@google.com>
Wed, 18 Feb 2015 11:38:03 +0000 (11:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 18 Feb 2015 11:38:03 +0000 (11:38 +0000)
* commit '955470ede6e6338b7b4749ebae275b87381dadde':
  Port back gles bug fixes and rotation fix


Trivial merge