summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbohu <bohu@google.com>2015-02-18 11:38:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-18 11:38:03 +0000
commitbb7eede27495056e84e090256d2d42b130ca14fa (patch)
tree542351fcd13a7390640179d933e394d7cd56e7a1
parent961a0dde4b43f51ab707c756e3b8852e5007fc81 (diff)
parent955470ede6e6338b7b4749ebae275b87381dadde (diff)
downloadandroid_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