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