OSDN Git Service

am 277c6bb7: am 6175442a: Merge changes Ibe92d8b5,I9bada598
authorBrian Carlstrom <bdc@google.com>
Wed, 6 Aug 2014 12:10:57 +0000 (12:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 6 Aug 2014 12:10:57 +0000 (12:10 +0000)
* commit '277c6bb72a0899dd7c4462bcd8a67fcdeab90650':
  Make system use patchoat to relocate during runtime.
  Temporary fix for bad LIR generation in GenInlinedGet.


Trivial merge