diff options
| author | Etan Cohen <etancohen@google.com> | 2015-07-08 19:10:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-08 19:10:19 +0000 |
| commit | e35c2d2fbc3f5f25db006a51a6e2bc9169389b35 (patch) | |
| tree | 5b9bd2d0ede45ff3ab564a094b83a5f30dbdae73 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7617f55ed14a55c2e314038373ca3f85e378c62a (diff) | |
| parent | 3aa1b1e5ec3a4e2074ea054b931cd68df45b43cf (diff) | |
am 3aa1b1e5: Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev
* commit '3aa1b1e5ec3a4e2074ea054b931cd68df45b43cf':
Lock screen text: consider possible WFC service in APM
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions