diff options
| author | Philip Cuadra <philipcuadra@google.com> | 2016-06-30 23:27:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-30 23:27:00 +0000 |
| commit | 015a075d7ba67715e149b7f20d0f11fc1b8c4e6f (patch) | |
| tree | 1ee7381282166f4b3d6428e33e830a7fa5f23ec6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 37eae74dc0410573c9858df1032f26b75afa1648 (diff) | |
| parent | e260ba666fed6a4f64756d3b0da0dc91b7836afa (diff) | |
Merge \"Pinner Service - Pin Camera app on unlock if requested by the config\" into nyc-mr1-dev
am: e260ba666f
Change-Id: I460e52ac73c0836c72a313cb890971e8a0767ef8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions