diff options
| author | Bart Sears <bsears@google.com> | 2014-12-12 22:49:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-12 22:49:43 +0000 |
| commit | 10fe046c93324903eea2667dd3ff679930ec997d (patch) | |
| tree | 2adf8c330dcddff51a6e50bb40347fe7172ad5be /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | e260a358bfc945bf01d901f496b7f30784cbf920 (diff) | |
| parent | 1f28a6a571a9b4ff78d85e2b62a30d77ce986d7b (diff) | |
am 1f28a6a5: resolved conflicts for merge of 08c72334 to lmp-mr1-dev
* commit '1f28a6a571a9b4ff78d85e2b62a30d77ce986d7b':
Tune delivery and batching of alarms
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions