tree 6612a4783a0af5dacf89a520c8ea80420dc0103b
parent 795bcc13c76284147cb40a9f8dc2307e5c15cde5
parent d1ca738ebcb9462e35174e06b04e56a039432c5e
author Jeff Sharkey <jsharkey@android.com> 1321513153 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1321513153 -0800

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