tree f2c4d7208e44e996350829f771cb44991299dc35
parent ee2cfe48d4fb36906c59c2ae545808dba01f90d8
parent 886e7a63b122a30c69c663d32e3e5f880a07593e
author Adam Lesinski <adamlesinski@google.com> 1439945615 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439945615 +0000

am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev

* commit '886e7a63b122a30c69c663d32e3e5f880a07593e':
  Change default cellular activity timeout to 10