commit | 10e4a45f691e6b60278fc772dedfe7646e615d0e | [log] [tgz] |
---|---|---|
author | Andreas Gampe <agampe@google.com> | Wed Nov 19 18:31:11 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 19 18:31:11 2014 +0000 |
tree | 94c5301177564ea89b8c725b7d40a51f0d1475bd | |
parent | 2ccf4779ad24b86aeca7fe32eced1e4a8006999c [diff] | |
parent | 387116f557c3d3ecf7bd82e1d9dd1910ca4c4a3d [diff] |
am 387116f5: am c3507d10: Merge "Frameworks/base: Replace LOG_FATAL_IF in core/jni" * commit '387116f557c3d3ecf7bd82e1d9dd1910ca4c4a3d': Frameworks/base: Replace LOG_FATAL_IF in core/jni