diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-02-05 23:04:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-05 23:04:21 +0000 |
| commit | 4fdac61388bd25a4a5bf6caef5bee0360e48ab51 (patch) | |
| tree | 81a69d56004a7a0be4e060ad9b09d325b4ae5f20 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | ba87ba5e4cc929f34921ff9fa875c38eca2bc1d0 (diff) | |
| parent | 29039a2bdbadcc427a966f5e7a6021fd424c4266 (diff) | |
am 5c2fdc33: Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev
automerge: 29039a2
* commit '29039a2bdbadcc427a966f5e7a6021fd424c4266':
Always re-establish kernel alarms when considering new alarm set
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions