tree 2e6c7cfa32c293f7fd4aa65eb772567fe6465e65
parent 213f391635ad89f36c4ec0a9ab3009371836f584
parent 5fed07aa18e0300656a74eab06e339dda999b352
author Robert Greenwalt <robdroid@android.com> 1274829202 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274829202 -0700

am d1055a25: Make the NTP Cache max-age gservices-settable

Merge commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae' into froyo-plus-aosp

* commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae':
  Make the NTP Cache max-age gservices-settable