summaryrefslogtreecommitdiffstats
path: root/packages/CaptivePortalLogin
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-07-25 16:14:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-25 16:14:50 +0000
commit08f5cd338566d5bab06003eadf29156bd6367690 (patch)
treeda4b1ba01c0dd92b844353021947bcb84aa0d1d7 /packages/CaptivePortalLogin
parentfab538f99b251c368b7c1f39453d9cd7553fad6d (diff)
parent763611dd04396943b86f3877c68d482239e0a729 (diff)
downloadframeworks_base-08f5cd338566d5bab06003eadf29156bd6367690.zip
frameworks_base-08f5cd338566d5bab06003eadf29156bd6367690.tar.gz
frameworks_base-08f5cd338566d5bab06003eadf29156bd6367690.tar.bz2
am 763611dd: (-s ours) am 16467c1d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '763611dd04396943b86f3877c68d482239e0a729': Import translations. DO NOT MERGE
Diffstat (limited to 'packages/CaptivePortalLogin')
0 files changed, 0 insertions, 0 deletions