| commit | 04327607d0a7cdeefcc20a83f3d2eccead128501 | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Mon Aug 27 23:03:50 2012 -0700 |
| committer | Irfan Sheriff <isheriff@google.com> | Mon Aug 27 23:03:50 2012 -0700 |
| tree | 8dbc7e39cb902e557bbbad84e5b540e31775a380 | |
| parent | 03ca5c9f8393ef79df1df383b9746c22da6341a7 [diff] | |
| parent | ba8388bf7a72ee5390e0f7329edd09acaa6c0930 [diff] |
Merge commit '949dcad8' into manualmerge Conflicts: services/java/com/android/server/ConnectivityService.java Change-Id: I02fee6839c2a8879fb6e885d8fc8483f17d655c2