tree b3365f5c80b2a8b72fc2e4a61cc87b8e948be79f
parent 166c1b2e7a1a48a39ecd2400b94f9f21c9868810
parent faa42dbede4d839dc52957bb984be70df682adea
author John Reck <jreck@google.com> 1315430807 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1315430807 -0700

Merge "OnTrimMemory plumbing"