diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-06-08 06:35:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-08 06:35:32 +0000 |
| commit | 3e2bfbd1357e3795d87becddcb74415d91192347 (patch) | |
| tree | a12e5ba28ebdb6e495b27e3542df835100cf1db0 /tools/aapt2/diff/Diff.cpp | |
| parent | 5c32d65e78dce57d671e355042b1258b83074067 (diff) | |
| parent | eab17da5882e59caff25c73aa6bcd0587aca9dd4 (diff) | |
Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev
* changes:
Give WakeupMessage the ability to transport an object as well.
Don't treat the lingerExpired broadcast specially.
Add a test for mobile data always on.
Add a FakeSettingsProvider and use it in ConnectivityServiceTest.
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions