OSDN Git Service

am b874e514: (-s ours) am e344f24b: am 7423f0b6: Merge "ART: Do not allow RETURN_VOID...
authorAndreas Gampe <agampe@google.com>
Thu, 27 Aug 2015 04:09:23 +0000 (04:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 04:09:23 +0000 (04:09 +0000)
commit0697f5e538096455d25301a7d575438d42677049
tree691f879c01823127858bf4d07d9bd849f6e4d827
parent858ba4aeff15a5aba65398e2f16c5b6d3e80b755
parentb874e514b7962f4f9219c24e1da7a8778ef45c7c
am b874e514: (-s ours) am e344f24b: am 7423f0b6: Merge "ART: Do not allow RETURN_VOID_NO_BARRIER outside constructors"

* commit 'b874e514b7962f4f9219c24e1da7a8778ef45c7c':