tree 6484151f25f89ad608c150ffa05bc0d1dba23c34
parent 448216e7b8822ae9c1c44836482c95f2becc220d
parent ed6160d299dadb4898360d55b2fb14e69ebb7ab3
author Adam Lesinski <adamlesinski@google.com> 1439930614 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1439930614 +0000

Merge "Change default cellular activity timeout to 10" into mnc-dev