diff options
| author | Joe Onorato <joeo@google.com> | 2016-05-09 20:16:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-09 20:16:56 +0000 |
| commit | 4240daca3afe78652d775bf5431beb9e10c531d3 (patch) | |
| tree | 042fddd993187f7143b5d3f4525404ea67d52453 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 80db52bf1614d308386e8e90c848b63b53779158 (diff) | |
| parent | ac29617c6e11085c9648d150a50c5daa15d65645 (diff) | |
Merge changes I04301fbd,If6577602 into nyc-dev
am: ac29617c6e
* commit 'ac29617c6e11085c9648d150a50c5daa15d65645':
Flesh out the docs for the android.os.health package.
Properly blame the correct uid for wakeup alarms that don't have a WorkSource.
Change-Id: I28bae3d984af6d19852fb63eda5fb21c1b6c98dd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions
