diff options
| author | Craig Mautner <cmautner@google.com> | 2014-12-01 05:21:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-01 05:21:48 +0000 |
| commit | 3395e39c5dde71c1fce41f1e29259f21e2df347c (patch) | |
| tree | eb65f1f729019b0e91126b2c14b2c114a6116021 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d3794d681a31872e886c17e1022e112e05a45228 (diff) | |
| parent | 0124980e9fe2f5d21748254441229820cca6b601 (diff) | |
am 0124980e: resolved conflicts for merge of 082c0540 to lmp-mr1-dev-plus-aosp
* commit '0124980e9fe2f5d21748254441229820cca6b601':
Prevent showing immersive confirmation unexpectedly
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions