| commit | f8a464d3ed6acac8c11e72695903478b10059f45 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Thu Nov 17 11:46:26 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 17 11:46:26 2011 -0800 |
| tree | 27bbc5d508fc7a2ddaa93dcf8bdc84e0ba691b97 | |
| parent | 47696dab423fb5cb352cece0cafb715bb2f73d7b [diff] | |
| parent | 1b11309907b562f67cb895fa42074522580baedc [diff] |
am 66b570c7: am b9df01d3: Merge "Update NTP outside locks, log large trim events." into ics-mr1 * commit '66b570c70471976cd2a99825898c778a7850f2c8': Update NTP outside locks, log large trim events.