| commit | 56065891abf383b0409ae595437dcb0ea132e32b | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Sat Sep 21 11:52:42 2013 -0700 |
| committer | Wink Saville <wink@google.com> | Sat Sep 21 11:52:42 2013 -0700 |
| tree | 9d21815c17d8eef6ff924e7a9de7ffc7cf14b034 | |
| parent | 6c025eaf29634d248bf067c2d9967e1905863f0c [diff] | |
| parent | 53221120049c2fea27158864f2e615c08d410780 [diff] |
Merge commit '53221120' into fix-merge-conflict * commit '53221120': Do not always call setIsConnectedToProvisioningNetwork(false) Conflicts: core/java/android/net/MobileDataStateTracker.java Change-Id: I497b57cb96d0f3b3bce4f4e1cbc5febcc6421597