tree 31072cda6c317e1060ca02a6480887f0914e1b63
parent c2477a924f8474b27f86ea365f975c7fd736c176
parent c2093636db6141426ca7fe88f07b30a284e36759
author Robert Greenwalt <robdroid@android.com> 1271619310 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1271619310 -0700

am c2093636: am 7171ea81: Make ThrottleService more tamper resistant.

Merge commit 'c2093636db6141426ca7fe88f07b30a284e36759' into kraken

* commit 'c2093636db6141426ca7fe88f07b30a284e36759':
  Make ThrottleService more tamper resistant.