tree 65a9be838a789cb38a03645c2e0ac9d284bf03e7
parent 534bc027a2fc5136988e6785c2d647054daf2713
parent 64ba76c1431afe17c1f4553f1dbc595db064316e
author The Android Open Source Project <initial-contribution@android.com> 1279312493 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279312493 -0700

am 64ba76c1: merge from open-source master

Merge commit '64ba76c1431afe17c1f4553f1dbc595db064316e'

* commit '64ba76c1431afe17c1f4553f1dbc595db064316e':
  Fixed LOG_ASSERT() compilation errors in native debug builds.