OSDN Git Service

am be5cafe5: resolved conflicts for merge of 684ceef6 to mnc-dev-plus-aosp
authorAndreas Gampe <agampe@google.com>
Thu, 25 Jun 2015 00:44:32 +0000 (00:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 25 Jun 2015 00:44:32 +0000 (00:44 +0000)
commit81fb98861f7b3d21c1483341dfdfd016066480fc
tree0edf218a04af9f570c36c4ab8a5b1e1e7e173b02
parentddfda2d7fb532fc14722f69ac92d386651677b5c
parentbe5cafe5feb513189877f14fe241adc6907fe915
am be5cafe5: resolved conflicts for merge of 684ceef6 to mnc-dev-plus-aosp

* commit 'be5cafe5feb513189877f14fe241adc6907fe915':
  ART: Correctly hard-fail method with undefined register