tree 7ecdaa58915fd10e054aac958e70b8f03bb4aaa2
parent 76d4bd3e4232c045f48afc0d4b6ca75dbbd2a148
parent cb094a783f14daae3378ac8aa7dc509980f037b2
author Romain Guy <romainguy@google.com> 1348787131 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348787131 -0700

am cb094a78: Merge "New compile-time flags to make debugging easier for us poor souls Bug #7195815" into jb-mr1-dev

* commit 'cb094a783f14daae3378ac8aa7dc509980f037b2':
  New compile-time flags to make debugging easier for us poor souls Bug #7195815