diff options
| author | Rubin Xu <rubinxu@google.com> | 2016-09-14 17:53:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-14 17:53:45 +0000 |
| commit | 8dfad2494c969cf25359f483ec74a0629d0b9244 (patch) | |
| tree | e98889d7ccad2ccf1653eb9d865ab2d499e90afb /tools/aapt2/diff/Diff.cpp | |
| parent | 4daa1b7df4a80e31c7ea16022ff17a48c1644e3b (diff) | |
| parent | d6d2fbdf3dd9949ab8ae0a2847d0c3ef0fb6ef9a (diff) | |
Merge "Allow direct-boot aware activity to show before profile is unlocked" into nyc-mr1-dev am: b0c59bb504
am: d6d2fbdf3d
Change-Id: I92ea621af49a34fb9421638d2d760d7340f23073
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions