diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-08-27 13:57:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-27 13:57:58 -0700 |
| commit | 116ee10b95ffff658618be42544ce80971ce28e8 (patch) | |
| tree | 2b1a0afba2c76dc785f4701f597b0e2f7a3be611 /core/java/android/view/ViewParent.java | |
| parent | e45ca31a613d8692a9db2117be96f442e57abfef (diff) | |
| parent | 69ddab4575ff684c533c995e07ca15fe18543fc0 (diff) | |
| download | frameworks_base-116ee10b95ffff658618be42544ce80971ce28e8.zip frameworks_base-116ee10b95ffff658618be42544ce80971ce28e8.tar.gz frameworks_base-116ee10b95ffff658618be42544ce80971ce28e8.tar.bz2 | |
Merge "Always-on VPN." into jb-mr1-dev
Diffstat (limited to 'core/java/android/view/ViewParent.java')
0 files changed, 0 insertions, 0 deletions