diff options
| author | Rubin Xu <rubinxu@google.com> | 2016-08-24 14:28:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-24 14:28:59 +0000 |
| commit | 50c5f4ac38471a8b07bd2ca0eaa1433d4af86426 (patch) | |
| tree | 8720051c36bb88ea8068823ab10bb0bd6ff9bf12 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6b3c49d2b8b3ea2c22d17e74c2f311d3e172bbed (diff) | |
| parent | 4d826638ab1ba3f90a67d0cf4d9256d4e88ee002 (diff) | |
Merge "Set DeviceLockedForUser state synchronously" into nyc-mr1-dev
am: 4d826638ab
Change-Id: If6fa13004de30cef2c528a5fcdc460ff39f850cc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions