diff options
| author | Christopher Tate <ctate@google.com> | 2015-01-20 23:52:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-20 23:52:57 +0000 |
| commit | fb4fde7053ba4bbba79175c31f7cdcac464b4c1c (patch) | |
| tree | fd7b0109b22f09fc57d1660859ed52c461d7fab0 /tools/aapt2/diff/Diff.cpp | |
| parent | f0f5eee8238284aad08fd573959392542e57a8ab (diff) | |
| parent | 78a05de82daffdf746c252b49f12ef88073b0459 (diff) | |
Merge "Don\'t try to launch broadcast receivers during boot" into lmp-mr1-dev automerge: 14c33f6
automerge: 78a05de
* commit '78a05de82daffdf746c252b49f12ef88073b0459':
Don't try to launch broadcast receivers during boot
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions