tree f9ed374d14f8514938cdd481bd4107db9cdc7374
parent daef336718592fa8f1068a9cb96ce83cb1942749
parent fd867303861eb25bf7973739e71dc29b6356a336
author Mark Salyzyn <salyzyn@google.com> 1423587204 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423587204 +0000

am fd867303: Merge changes I420b5b8a,Ica23fe41

* commit 'fd867303861eb25bf7973739e71dc29b6356a336':
  log.h: wrap android_testLog around __android_log_is_loggable
  log.h: deprecate CONDITION