diff options
author | Adam Lesinski <adamlesinski@google.com> | 2014-08-29 21:07:20 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-29 21:07:20 +0000 |
commit | 5119ea7e35cd37041d15d830dacc14fa314fbbe1 (patch) | |
tree | 085c108bbacaf225a81325756a6799b1e42b7763 /packages/SystemUI/res/values-fr-rCA/strings.xml | |
parent | b423a1e22c1c0883c8c50c241733e69e9c86b835 (diff) | |
parent | d57e1cb644fc9f9f5a5cc86b41dce01ff1c6cef1 (diff) | |
download | frameworks_base-5119ea7e35cd37041d15d830dacc14fa314fbbe1.zip frameworks_base-5119ea7e35cd37041d15d830dacc14fa314fbbe1.tar.gz frameworks_base-5119ea7e35cd37041d15d830dacc14fa314fbbe1.tar.bz2 |
am 43186e07: am f5e3785e: am 84b95b66: Merge "Make UsageStats API comply with API Council" into lmp-dev
* commit '43186e0784ff597be49d272d43bd7d3767f9e935':
Make UsageStats API comply with API Council
Diffstat (limited to 'packages/SystemUI/res/values-fr-rCA/strings.xml')
0 files changed, 0 insertions, 0 deletions