tree 2af40922ee90ae594736622b02308c16c00098f0
parent f1f8b9cc3ff5774e695568e8f02b018c0fd02844
parent 0b6134b511e0aae7b834fd30198d464f1e13a6fa
author Dianne Hackborn <hackbod@google.com> 1436924992 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1436924995 +0000

Merge "Bump mms whitelist time up to 1 minute." into mnc-dev