diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-08-19 01:32:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-19 01:32:46 +0000 |
| commit | 56df15d3b41e6599e174da92352d85d11f9155ee (patch) | |
| tree | c11a352efa90de3ee4d2cd58b28791587d86b17a /tools/aapt2/diff/Diff.cpp | |
| parent | 40c758316302851a99cf6e285ed7b06497ac36f9 (diff) | |
| parent | 5b3a38e07dcdbae03f13a55d91a8936996ddc9cf (diff) | |
am 5b3a38e0: am bda9b324: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
* commit '5b3a38e07dcdbae03f13a55d91a8936996ddc9cf':
Change default cellular activity timeout to 10
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions