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