| commit | bf431bbf6d16fca11793400e16291ab91029f225 | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Thu Dec 05 22:45:06 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:45:06 2013 +0000 |
| tree | f03503c967b8db75837f9840c6d72416dcb09cc8 | |
| parent | 10454ee1f76bd06e1d7fe8300af38dfe42f4a954 [diff] | |
| parent | 16779256116983d8caf5e552a311a682e4c1e1ab [diff] |
am 16779256: (-s ours) am 4a909ab8: am d121059a: Merge "Make sure to not call getTelephonyManager with null context" into klp-dev * commit '16779256116983d8caf5e552a311a682e4c1e1ab':