diff options
| author | Mark Renouf <mrenouf@google.com> | 2014-11-01 15:21:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-01 15:21:42 +0000 |
| commit | efadfc0c205347febf95c32b80a09e9bd1121cf2 (patch) | |
| tree | 5af49756f230c6bf9c9c858cfc97c62a26a23449 /docs/html/training/secure-file-sharing/setup-sharing.jd | |
| parent | 591686210848ca1cddab192d6524bef5737c59d0 (diff) | |
| parent | 8c8c62a1bcc85166aca74510cf1440a29835cbdb (diff) | |
| download | frameworks_base-efadfc0c205347febf95c32b80a09e9bd1121cf2.zip frameworks_base-efadfc0c205347febf95c32b80a09e9bd1121cf2.tar.gz frameworks_base-efadfc0c205347febf95c32b80a09e9bd1121cf2.tar.bz2 | |
am 6497dd73: am b5c5a0dc: am 7be03da0: (-s ours) Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: c26d97c -s ours automerge: dc9ea93 -s ours
automerge: 8c8c62a -s ours
* commit '8c8c62a1bcc85166aca74510cf1440a29835cbdb':
Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
Diffstat (limited to 'docs/html/training/secure-file-sharing/setup-sharing.jd')
0 files changed, 0 insertions, 0 deletions