| commit | 955470ede6e6338b7b4749ebae275b87381dadde | [log] [tgz] |
|---|---|---|
| author | bohu <bohu@google.com> | Wed Feb 18 00:41:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 18 00:41:53 2015 +0000 |
| tree | 542351fcd13a7390640179d933e394d7cd56e7a1 | |
| parent | e1ad40345f9283e9e78eea000a7e87282ab1f81f [diff] | |
| parent | 3bf1205021bd384aac498b9c7d1ee166652e6944 [diff] |
am 3bf12050: am 7f721057: (-s ours) resolved conflicts for merge of 52667f55 to klp-modular-dev * commit '3bf1205021bd384aac498b9c7d1ee166652e6944': Port back gles bug fixes and rotation fix