diff options
| author | Craig Mautner <cmautner@google.com> | 2014-12-01 05:33:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-01 05:33:43 +0000 |
| commit | ad9c287add50853d0988c489f2a509b9ddd7ece8 (patch) | |
| tree | 566055051c3f63a36295226f7b943a41525c057d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8768672e789d774a71d1b6b1e04e77a1e404bfa2 (diff) | |
| parent | 10c40fc01d56ee17068cb61d5c19e6ab68f2ca48 (diff) | |
am 10c40fc0: am a12ac54c: am 25596374: Merge "[ActivityManager] Prevent provider from been created twice."
* commit '10c40fc01d56ee17068cb61d5c19e6ab68f2ca48':
[ActivityManager] Prevent provider from been created twice.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions