summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2Dan Pasanen2017-04-058-47/+47
|\ | | | | | | | | | | | | | | Android 7.1.2 Release 2 (N2G47E) # gpg: Signature made Mon 03 Apr 2017 01:41:50 AM CDT # gpg: using DSA key E8AD3F819AB10E78 # gpg: Can't check signature: No public key
| * Import translations. DO NOT MERGEBill Yi2017-02-024-42/+42
| | | | | | | | | | Change-Id: Ibfbbdc553978241cc89fc30e47e6c61be202c1c1 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBill Yi2016-11-044-5/+5
| | | | | | | | | | Change-Id: I4f06fe6072b402f47b67616e90de02108b46cb78 Auto-generated-cl: translation import
| * Only send DOWNLOAD_COMPLETE broadcast once.Jeff Sharkey2016-10-142-15/+25
| |\ | | | | | | | | | | | | | | | am: f96f51e8d7 Change-Id: I3a234d02ebf1a2bbdb52af82530d554417849d68
| * \ Launch APKs using content:// Uri with grant.Jeff Sharkey2016-10-041-13/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | am: 968b2f2ca3 Change-Id: I7bf9d5aab0eb94550ce32be9615c6eaea01e6506
| * \ \ Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: a969f081b6 ↵Bill Yi2016-09-170-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: e0e69444a8 -s ours Change-Id: I23a804c3aeadfff5ea81592eef0109a51c197ca5
| * \ \ \ Import translations. DO NOT MERGE am: 4de452f333 -s oursBill Yi2016-09-170-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a8a5f8a749 -s ours Change-Id: I2a5828c52aa518fe89c2790f1c301f8a867c1047
| * \ \ \ \ Merge commit 'c85df59e1cbc19afd486e2743fc59b3dc5ad8b35' into ↵Jeff Sharkey2016-09-171-0/+44
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manual_merge_c85df59 am: f367d6b2a0 Change-Id: I3cefb5dff31c154a12839dba15452f1a0bc40f3e
| * \ \ \ \ \ DO NOT MERGE: Listen to file changes on Downloads dir.Steve McKay2016-09-081-24/+107
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 12d4497cc1 Change-Id: Ife92fb387336956fa5ef8b70fb8063971d8906ce
| * \ \ \ \ \ \ Merge "DO NOT MERGE. Send "completed" broadcast if download cancelled." into ↵Jeff Sharkey2016-08-310-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nyc-mr1-dev am: 7edda42b80 Change-Id: I99f8aba98cc5071e9024a4fc3377d48e6b96f496
| * \ \ \ \ \ \ \ DO NOT MERGE. Send "completed" broadcast if download cancelled.Jeff Sharkey2016-08-312-11/+22
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c0496a0b0b Change-Id: I19d55af382ab6eb4ad080c402139eaf4df695ace
| * \ \ \ \ \ \ \ \ DO NOT MERGE. Update notifications when deleting downloads.Jeff Sharkey2016-08-311-0/+6
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2be85cd23d Change-Id: I724e6647d0cf82c2231c60f5e83721cb4c12d948
| * \ \ \ \ \ \ \ \ \ DO NOT MERGE: Check that file exists in disk in queryChildDocs am: a4b509c30aJorge Gil2016-08-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8c8f3a0c7b Change-Id: Id309c2da3818c4605e188d6ca223ad79f69d2fde
| * \ \ \ \ \ \ \ \ \ \ Revert "Enforce calling identity before clearing." am: b440ceb00f am: ↵Adam Seaton2016-08-261-13/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6777320335 am: a474af3a08 am: 8bec536bf2 am: 34ccbd80ea am: 956426bee5 am: 6a6944d1f4 am: 8e8770bdc8 am: 85a6e20a85 am: 465a080262 am: c46b6cc496 Change-Id: I1ba6dfaea02841e8ac6e4aa4f079a179a296f352
| * \ \ \ \ \ \ \ \ \ \ \ Merge "Configure code coverage filter." into nyc-mr1-devAllen Hair2016-08-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2f21e5f161 Change-Id: Ib38f40b19b0dbf33a0b3b0eba29d07acbac2c8a3
| * \ \ \ \ \ \ \ \ \ \ \ \ Configure code coverage filter.Allen Hair2016-08-261-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2a283e9853 Change-Id: Ia99fe23f14757fb362114b46c9f6b5e7e848059a
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "DO NOT MERGE: Check that file exists in disk in queryChildDocs" into ↵Steve McKay2016-08-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nyc-mr1-dev am: 4093cb5adb Change-Id: I6eca1a66132c601aa86fd0707e823cf6bec4c1e1
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ DO NOT MERGE: Check that file exists in disk in queryChildDocsJorge Gil2016-08-231-2/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 314026d4e8 Change-Id: I3456cd39d299e97e9d2ef7ce200596bd829c3cdc
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Enforce calling identity before clearing. am: 8be3a92eb0 am: ec19fe6485 am: ↵Jeff Sharkey2016-08-091-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b3ce7976f2 am: 860239d87e am: 616f47abce am: a9ea617232 am: 567e549614 am: 14ae5650e4 am: 80ab64c562 am: f4607cbdb8 Change-Id: I9a5f79fd6f872277f35d740e0fd487120392e0ff
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Waiting for Wi-Fi notification is not ongoing.Jeff Sharkey2016-07-281-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7b7fa39dec Change-Id: Ib5b8161ca3812b1200d96353bc7a3077e5cea01e
* | | | | | | | | | | | | | | | | | | Automatic translation importcm-14.1_oldAbhisek Devkota2017-03-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9f24a790ec7057b0be001d3bebe7c4aa382c864c
* | | | | | | | | | | | | | | | | | | Automatic translation importAbhisek Devkota2017-03-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I909fea50b7b6d26a31df7bd09b9c8dbe120c2df5
* | | | | | | | | | | | | | | | | | | Automatic translation importAbhisek Devkota2017-03-203-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I575efe47e1605c232d91aaeec506c32d55200804
* | | | | | | | | | | | | | | | | | | Automatic translation importAbhisek Devkota2017-03-153-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3ca425c68a8dd1d1545fd3a62ceae50a3dbb7f6f
* | | | | | | | | | | | | | | | | | | Automatic translation importAbhisek Devkota2017-03-086-1/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4dcb2f740e647c0495abc10a90e647826101a53f
* | | | | | | | | | | | | | | | | | | Automatic translation importMichael W2017-03-024-78/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I963dcb23b6dc1c55e6f2b39208590928d72c2e0e
* | | | | | | | | | | | | | | | | | | Automatic translation importAbhisek Devkota2017-02-233-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1f237f1c90a633d5816ebc84dd8504cd9b7f48b5
* | | | | | | | | | | | | | | | | | | Automatic translation importAbhisek Devkota2017-02-1615-6/+314
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2aac8c501435fd468ca188c121b81f2c1de2fe54
* | | | | | | | | | | | | | | | | | | Automatic translation importstaging/cm-14.1-cafrebaseinky@build012016-12-30134-0/+7055
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I97c79babd5ffd99b6f7e6221bd1d978f9cc8d761 Ticket: -
* | | | | | | | | | | | | | | | | | | DownloadProvider: Add support for manual pause/resumeZhao Wei Liew2016-12-308-10/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement the following features: - Manually pause/resume individual downloads in DownloadManager - Manually pause/resume all downloads in notification Based on commit ecd609e7017b8a69688bbae25c17d878ea305f19. Change-Id: I433cdee2de8b3add0248bbb0a9d02f8da4e5bb38
* | | | | | | | | | | | | | | | | | | DownloadProvider: Display download speed in notificationLasse Brudeskar Vikås2016-12-302-6/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the current total download speed to in-progress downloads shown in the notification pane. Change-Id: I801dbe61c7ee59d0c1d14d5851ad6dc3a7678499
* | | | | | | | | | | | | | | | | | | Merge a4ade1bc82cd526539e35dec99f923410161a35b on remote branchLinux Build Service Account2016-12-159-69/+185
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id8324baa63058cb8118ce852484f89635d51efd9
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge N-MR1 to remote branch.Naveen Kumar2016-12-089-69/+185
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2d421a72d91177fad5b23da4c682d78bcd1f9289
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'a6db712a32f86a79bc80873832c438de439b5645' into remoteLalit Kansara2016-12-069-69/+185
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/com/android/providers/downloads/DownloadProvider.java Change-Id: Ibc0a0d79a9a5e9127d181491537e62b2d78067a7
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-160-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-050-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-180-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-110-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | | | | |/| | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-010-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | | | | | | |/| | | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-280-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |_|_|_|_|_|_|_|/ / / / / / | | | | | | | | |/| | | | | | | | | | | | |
| | | | | | | | | * | | | | | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-240-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | |_|_|_|_|/ / / / / / / / | | | | | | | | | |/| | | | | | | | | | | |
| | | | | | | | | | * | | | | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-100-0/+0
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | |_|_|/ / / / / / / / / | | | | | | | | | | |/| | | | | | | | | | |
| | | | | | | | | | | * | | | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-07-310-0/+0
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | |_|/ / / / / / / / / | | | | | | | | | | | |/| | | | | | | | | |
| | | | | | | | | | | | * | | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-07-210-0/+0
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | |/ / / / / / / / / | | | | | | | | | | | | |/| | | | | | | | |
| | | | | | | | | | | | | * | | | | | | | | Clear identity when deleting scanned entry.Jeff Sharkey2016-06-281-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When deleting a file from DownloadManager, we also reach over and clean up any scanned MediaStore entries. However, DownloadManager clients may not hold the WRITE_EXTERNAL_STORAGE permission, such as when they downloaded a file into their package-specific directories. The safest fix for now is to clear the calling identity and always clean up the MediaStore entries ourselves, since DownloadProvider always holds the required storage permission. Bug: 29777504 Change-Id: Iea8f5696410010807b118bb56e5b897c53f0e1fe
| | | * | | | | | | | | | | | | | | | | | | Only send DOWNLOAD_COMPLETE broadcast once.Jeff Sharkey2016-10-142-15/+25
| | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apps might end up confused if we tell them a download was completed multiple times, so only send the broadcast exactly once when we transition it into a "completed" state, either during an update() or a delete() operation. Test: verified single broadcast with test app Bug: 31619480 Change-Id: I0b9139ea0e37f6d212b84314048692cd0c4f9cdf
| | | * / / / / / / / / / / / / / / / / / Launch APKs using content:// Uri with grant.Jeff Sharkey2016-10-041-13/+4
| | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PackageInstaller now supports reading from content://, so always launch using that path. Include URI permission grants so the receiver can access the contents. Test: installed downloaded APK Bug: 31807780 Change-Id: I488d14872e80ce4a092e7db6e1c58f3fe54a54c6
| | | * | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dr1-devBill Yi2016-09-170-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a969f081b6 -s ours Change-Id: I743b1b6f7bb8d1963711e2c79956223fc549e88e
| | | | * | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dr1-devTreeHugger Robot2016-09-171-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Import translations. DO NOT MERGEBill Yi2016-09-170-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4de452f333 -s ours Change-Id: Ib60b76d7c1db9fc5003acb4b0dbb96d361b2c734