diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-10-12 19:34:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-12 19:34:43 +0000 |
| commit | 651cb804b12614094c2b69a2133c8c0b2083556e (patch) | |
| tree | aee271942e96fb17d892040de876ac16742a8205 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 287cd2d1e4fc6cc77b466f51d24a1c3e086140ae (diff) | |
| parent | fe1934e470681ff7ec5b8ec0609ae9fe24bd7282 (diff) | |
am fe1934e4: Merge "RRO: idmap: allow flock(2) to block"
* commit 'fe1934e470681ff7ec5b8ec0609ae9fe24bd7282':
RRO: idmap: allow flock(2) to block
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions