diff options
| author | Shijian Li <shijianli@google.com> | 2017-01-12 03:19:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-12 03:19:33 +0000 |
| commit | 896619a7edef59dee96e358d2706a03b86e7ef55 (patch) | |
| tree | fdcfc944b338e9b35a84889fc4e643dcef61e673 /tools/aapt2/diff/Diff.cpp | |
| parent | 8e8ed2013c595e59807e9e740f343c71f3b9cc3d (diff) | |
| parent | 8ec5d822c151806c6669017c90b52d839038dc71 (diff) | |
Merge "Sync the startConsentUiIfNeeded logics to master. We are missing the package name when starting the activity now. am: 5e7fc7ccc8 am: ae21066a59" into nyc-mr2-dev-plus-aosp
am: 8ec5d822c1
Change-Id: Ida281cd80308107dc02bf2b282d1a00ccfdb51c5
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions