tree c1db669055f3561b9dc5d01dec37697c8301e28e
parent 62ab1caa384fb17329891fbc24c959c7850e16c3
parent 24bc8d761ae525f82dcaeee576ae238ab3a2de03
author Dianne Hackborn <hackbod@google.com> 1420499710 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420499710 +0000

am 24bc8d76: am 29807195: Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev

* commit '24bc8d761ae525f82dcaeee576ae238ab3a2de03':
  Fix issue #18901214: APR: Frequent crash in android