tree 159635e29330c94fe4eb9e780350b4fe75ba3ff9
parent 76c7c028ba3f0eeb17b7cf4709883ace0ffc83c5
parent 4572c8fed0ab19dc00c4c0fb42b0c34d42dca333
author Steve Block <steveblock@google.com> 1319565366 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319565366 -0700

am 4572c8fe: (-s ours) Rename LOG() to ALOG()  DO NOT MERGE

* commit '4572c8fed0ab19dc00c4c0fb42b0c34d42dca333':
  Rename LOG() to ALOG()  DO NOT MERGE