summaryrefslogtreecommitdiffstats
path: root/packages/VpnDialogs/res
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2014-08-21 04:08:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-21 04:08:46 +0000
commitb818431016422e7b4f5e147030794f652f15babe (patch)
treedd48201e794eef9f41adbc7fe47cd0a0a5478dff /packages/VpnDialogs/res
parent6a1732832ed7aeb16b46ff9a90a173562fb5652c (diff)
parent58201d9a8b050ffbaf4787bc3b21ee98bc41aaf7 (diff)
downloadframeworks_base-b818431016422e7b4f5e147030794f652f15babe.zip
frameworks_base-b818431016422e7b4f5e147030794f652f15babe.tar.gz
frameworks_base-b818431016422e7b4f5e147030794f652f15babe.tar.bz2
am 3c67899a: am 614e4635: am d5d82cf3: Merge "Add a hidden method to query profile owner name for a user" into lmp-dev
* commit '3c67899a94c890e199d9bda599ac5266c3e11c6c': Add a hidden method to query profile owner name for a user
Diffstat (limited to 'packages/VpnDialogs/res')
0 files changed, 0 insertions, 0 deletions