OSDN Git Service

am fcc91b80: resolved conflicts for merge of bebee4fd to lmp-dev-plus-aosp
authorAndreas Gampe <agampe@google.com>
Thu, 24 Jul 2014 19:48:27 +0000 (19:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Jul 2014 19:48:27 +0000 (19:48 +0000)
* commit 'fcc91b80ae77827726ab93d237f794f87b97a2e6':
  ART: Refactor GenSelect, refactor gen_common accordingly


Trivial merge