am 37fc8cc7: am b724d251: Merge "Enable strictmode logging in system_server &...
am 37fc8cc7: am b724d251: Merge "Enable strictmode logging in system_server & add a lock." into gingerbread
Merge commit '37fc8cc7'
* commit '37fc8cc7':
Enable strictmode logging in system_server & add a lock.