OSDN Git Service

am b43189b2: (-s ours) am 6d20c2e2: Merge "Fix imt conflict trampoline for mips64...
authorMathieu Chartier <mathieuc@google.com>
Wed, 24 Jun 2015 20:55:42 +0000 (20:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Jun 2015 20:55:42 +0000 (20:55 +0000)
commit1bd6cf50aceea5e028b416407eb9c9a6412c312e
tree01b9c8a85fd17b2f30b1c1b45de4a1f5be4ae032
parentfa48346186cd409e917e62c989ac00bfcadc69bd
parentb43189b26f62f2b17569b07ab935ba7344be7433
am b43189b2: (-s ours) am 6d20c2e2: Merge "Fix imt conflict trampoline for mips64" into mnc-dev

* commit 'b43189b26f62f2b17569b07ab935ba7344be7433':
  Fix imt conflict trampoline for mips64