diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-02-05 19:39:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-05 19:39:23 +0000 |
| commit | 29039a2bdbadcc427a966f5e7a6021fd424c4266 (patch) | |
| tree | bb2fcf748c19d36ca183aba09fb05ff1a363df23 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 6d72d46b4b6fe0ec72c24ea5369c6d92fd29ba52 (diff) | |
| parent | 5c2fdc331f81b671d426f3f5a7e59cd9cbed80bf (diff) | |
am 5c2fdc33: Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev
* commit '5c2fdc331f81b671d426f3f5a7e59cd9cbed80bf':
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