diff options
| author | Rubin Xu <rubinxu@google.com> | 2016-09-15 11:29:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-15 11:29:47 +0000 |
| commit | 5424ac39787e02c583e3dec525513dd1ff82818b (patch) | |
| tree | 055009e47ac66b83e176d2385c98845ce4b28156 /tools/aapt2/diff/Diff.cpp | |
| parent | 3ba5331a83b86d2d898851387268e93ace1e4180 (diff) | |
| parent | 8dfad2494c969cf25359f483ec74a0629d0b9244 (diff) | |
Merge "Allow direct-boot aware activity to show before profile is unlocked" into nyc-mr1-dev am: b0c59bb504 am: d6d2fbdf3d
am: 8dfad2494c
Change-Id: Ib2440eb8a3d94f2f40af55886b82058f935a8836
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions