Merge commit '6139bf60e83753750fa1009de6da85033dad1820' into eclair-mr2-plus-aosp * commit '6139bf60e83753750fa1009de6da85033dad1820': Add AGGREGATION_INTERVAL_SECONDS (fixing the build)
Merge commit '6139bf60e83753750fa1009de6da85033dad1820' into eclair-mr2-plus-aosp * commit '6139bf60e83753750fa1009de6da85033dad1820': Add AGGREGATION_INTERVAL_SECONDS (fixing the build)