tree f19e9658ba3496bcd10b4c814c0cfcdf85a08d8d
parent 5eb49e0f1e8e03e8808d8d7da6d5ffb761400e0b
parent 52749c0b1117a05a9c853b7d54f69a281f69cf3c
author Conley Owens <cco3@android.com> 1304120660 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1304120660 -0700

am 52749c0b: am 03daee63: Merge "frameworks/base: acquire lock on am only when needed"

* commit '52749c0b1117a05a9c853b7d54f69a281f69cf3c':
  frameworks/base: acquire lock on am only when needed