am b9df01d3: Merge "Update NTP outside locks, log large trim events." into ics-mr1

* commit 'b9df01d39692c45b182c429015cc2086ef27db97':
  Update NTP outside locks, log large trim events.
This commit is contained in:
Jeff Sharkey 2011-11-16 23:01:15 -08:00 committed by Android Git Automerger
commit 1b11309907

Diff Content Not Available