diff options
author | bohu <bohu@google.com> | 2015-02-18 11:38:03 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-18 11:38:03 +0000 |
commit | bb7eede27495056e84e090256d2d42b130ca14fa (patch) | |
tree | 542351fcd13a7390640179d933e394d7cd56e7a1 | |
parent | 961a0dde4b43f51ab707c756e3b8852e5007fc81 (diff) | |
parent | 955470ede6e6338b7b4749ebae275b87381dadde (diff) | |
download | android_device_generic_goldfish-bb7eede27495056e84e090256d2d42b130ca14fa.tar.gz android_device_generic_goldfish-bb7eede27495056e84e090256d2d42b130ca14fa.tar.bz2 android_device_generic_goldfish-bb7eede27495056e84e090256d2d42b130ca14fa.zip |
am 955470ed: am 3bf12050: am 7f721057: (-s ours) resolved conflicts for merge of 52667f55 to klp-modular-dev
* commit '955470ede6e6338b7b4749ebae275b87381dadde':
Port back gles bug fixes and rotation fix
0 files changed, 0 insertions, 0 deletions