| commit | afefad3213e7942caa8dd051dfc0f75b289024b2 | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Thu Dec 05 22:43:14 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:43:14 2013 +0000 |
| tree | adb64c650885008a1b21eaedbeb3b9fc778f44aa | |
| parent | 2a43b6811d95830593dab6f2fb53dfc458fd85db [diff] | |
| parent | 0816267f70c9ef14e31f49ffd9bdf4c38a917f48 [diff] |
am 0816267f: (-s ours) am a9f2faa9: am a48ad8bd: PROXY_SERVICE may be missing and its reference null. * commit '0816267f70c9ef14e31f49ffd9bdf4c38a917f48':