OSDN Git Service

am 32a2d5ed: resolved conflicts for merge of edc631c2 to lmp-mr1-dev-plus-aosp
authorStephen Hines <srhines@google.com>
Thu, 30 Oct 2014 21:42:32 +0000 (21:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Oct 2014 21:42:32 +0000 (21:42 +0000)
commitea1605c873c381a9e2ba94390027b70418a4de61
tree0ce4542516bf1f030268a80b96cc9b43c6019511
parent959e17b665e5e4a49932ebb3a1f1ff4d78fc3c80
parent32a2d5ed927dc586e26c01fe93c85815b542efed
am 32a2d5ed: resolved conflicts for merge of edc631c2 to lmp-mr1-dev-plus-aosp

* commit '32a2d5ed927dc586e26c01fe93c85815b542efed':
  Merge in the following upstream patches to resolve Cortex-A57 crashes.