diff options
| author | Craig Mautner <cmautner@google.com> | 2014-12-09 16:45:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-09 16:45:53 +0000 |
| commit | 40c5c0ef16462668fb13717f59254f8696eac127 (patch) | |
| tree | ed09bb4a7640f6a0b1e84a19b37beaced1e95937 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d50a5e7486432f7554f5135ac0609531d0fa8663 (diff) | |
| parent | 74a660136096d0ab10fe8d0f99c63ef535aa5552 (diff) | |
am 74a66013: am f71f5e89: Merge "[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked."
* commit '74a660136096d0ab10fe8d0f99c63ef535aa5552':
[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions