OSDN Git Service

am c14041a9: (-s ours) am 3d5e5f90: am 4a3fff8f: (-s ours) am 471b7cb6: HACK: Disable...
authorMathieu Chartier <mathieuc@google.com>
Wed, 29 Apr 2015 04:24:54 +0000 (04:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Apr 2015 04:24:54 +0000 (04:24 +0000)
* commit 'c14041a9192c264c048eb3bb1153006abc498bb6':
  HACK: Disable native stack trace dumping for tetra. DO NOT MERGE


Trivial merge