diff options
| author | George Mount <mount@google.com> | 2015-01-27 23:30:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-27 23:30:18 +0000 |
| commit | 206db8a70f0ccbef92e006956fea652ef790b541 (patch) | |
| tree | f27a814fe7759534437b0229ba7b59b97fe202c2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b805dd3a8e4fda83aa41738eb761300a45107267 (diff) | |
| parent | 5c25f5b0a7de7c05e71a88373223d579c3823415 (diff) | |
am fff84a23: Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev automerge: aa6945a
automerge: 5c25f5b
* commit '5c25f5b0a7de7c05e71a88373223d579c3823415':
Activity Transition: fix quick back after enter.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions