tree 47d8d003e9456fd54b5747eb5e53a9887bb414aa
parent 6c0b8b794a6d49c36daa6442a24e2aee3b43ddd4
parent d0e0154c1f0be7786f12aea60add7ed4fb7c4e6c
author Dianne Hackborn <hackbod@google.com> 1411506377 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411506377 +0000

am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev

* commit '5a9cfe3ea7fdcec78094530032217fca477561b1':
  Maybe fix issue #17614177 APR: system process restarting due to infinite loop