diff options
| author | Craig Mautner <cmautner@google.com> | 2015-02-03 18:09:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-03 18:09:38 +0000 |
| commit | b95a8abcafbd9b5c8c6c08abe0a94c2224d251ad (patch) | |
| tree | 1f8b10499a060391b1dd028a3fb5947196994742 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 5656036dd779fd81d89b755b871e85fa6d959c4f (diff) | |
| parent | c0e9c1d0a405c66e7ec75eb6268f84fe1d466344 (diff) | |
am c0e9c1d0: am 240e8743: Merge "[ActivityManager] Set appropriate relation of task to home" automerge: 7d1aded
* commit 'c0e9c1d0a405c66e7ec75eb6268f84fe1d466344':
[ActivityManager] Set appropriate relation of task to home
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions