tree 2d87a6feb6a5e02665103a0953fb571f370b5105
parent 294c9fb8990ded73be52a3c1bfddbe1cebcd8b8e
parent c27181c7f3e11170ec82807cfa416f0a906ff574
author Christopher Tate <ctate@google.com> 1277934944 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1277934944 -0700

Merge "Remove memory monitoring from the system watchdog" into gingerbread