diff options
| author | Mark Renouf <mrenouf@google.com> | 2014-11-01 14:55:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-01 14:55:00 +0000 |
| commit | 8c8c62a1bcc85166aca74510cf1440a29835cbdb (patch) | |
| tree | 30e157a9c7d98ae61730aa5e85204040b9e2c4fe /core/java/android/provider/SearchIndexablesContract.java | |
| parent | ae4297e2ef5e0713ecf78112b57b97444f20c818 (diff) | |
| parent | dc9ea936d0f1ed88f7be6e0bfe09acf2dacd9200 (diff) | |
| download | frameworks_base-8c8c62a1bcc85166aca74510cf1440a29835cbdb.zip frameworks_base-8c8c62a1bcc85166aca74510cf1440a29835cbdb.tar.gz frameworks_base-8c8c62a1bcc85166aca74510cf1440a29835cbdb.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
* commit 'dc9ea936d0f1ed88f7be6e0bfe09acf2dacd9200':
Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
Diffstat (limited to 'core/java/android/provider/SearchIndexablesContract.java')
0 files changed, 0 insertions, 0 deletions