summaryrefslogtreecommitdiffstats
path: root/packages/VpnDialogs
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2012-12-12 11:46:41 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-12 11:46:41 -0800
commit912f01865ab879314ac86dc9a61b62e2e7bd5911 (patch)
tree578c5ae82d7adb4ed082baed41d528d552eda7bc /packages/VpnDialogs
parentca059d6d1f62db8c094ce9d1451cc7a386d04aaf (diff)
parent68c308607b01bafd31c91572a81f4563e2199260 (diff)
downloadframeworks_base-912f01865ab879314ac86dc9a61b62e2e7bd5911.zip
frameworks_base-912f01865ab879314ac86dc9a61b62e2e7bd5911.tar.gz
frameworks_base-912f01865ab879314ac86dc9a61b62e2e7bd5911.tar.bz2
am 68c30860: am 73f24ae1: am 9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev
* commit '68c308607b01bafd31c91572a81f4563e2199260': Don't update global table when upgrading secondary users' database.
Diffstat (limited to 'packages/VpnDialogs')
0 files changed, 0 insertions, 0 deletions