summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt ↵Zach Jang2015-09-161-5/+3
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to 900s."" into lmp-mr1-dev * commit '203b43547da94c9fb78931680b99f9db49fc46c9': Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
| | | * | | | | | | Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" ↵Zach Jang2015-09-161-5/+3
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev
| | | | * | | | | | Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."Zach Jang2015-09-151-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 82b70db7dd906013d131737a5bec2ae59b41ae61. Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f
* | | | | | | | | | Default grant SMS and Phone to the verifierSvet Ganov2015-09-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:24012164 Change-Id: I756644c8044076b2550d7ca104f542f50da0226b
* | | | | | | | | | Add op package to the UID special case handling in account manager.Svetoslav2015-09-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The account manager has a hardcoded rule to change the calling UID if the caller is the system and another UID is passed in. We have to do the same acrobatics for the app op package as if the UID changes the opPackageName will not match the new UID. If we used the passed in UID we should also use the passed in op package name. bug:23968092 Change-Id: I0c0c2a720e9edbf82001952929d990702f8650ca
* | | | | | | | | | Merge "Add get_accounts app op" into mnc-devSvetoslav Ganov2015-09-096-58/+86
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add get_accounts app opSvetoslav2015-09-086-58/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For each runtime permission we have an app op to toggle the permission for legacy apps as they cannot handle permission revocations. We were lacking an app op for get_accounts which prevented the user from controlling access to accounts regardelss that they change the state of the permission toggle in the UI. Even worse the permission UI is written with the assumption that every runtime permission has an app op and as a result revoking the contacts group (if the app requests the get_accounts permission) is reset back to allowed in the UI. bug:23854618 Change-Id: I9e3f9bfeb320bed561d718db99ee285915d5701b
* | | | | | | | | | | am 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of ↵Android Git Automerger2015-09-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev * commit '1c88f605629a5f1647a8af1fdcfe0fb6e3eea847': docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
| * | | | | | | | | | Merge branch 'lmp-mr1-ub-dev' of ↵Android Git Automerger2015-09-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev
| | * \ \ \ \ \ \ \ \ \ am 4b32b3f4: Merge "docs: change intro and title for contacts and sign-in ↵Cheryl Potter2015-09-083-6/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lesson, and remove empty bullet" into mnc-preview-docs * commit '4b32b3f43fe8e27ffdb19d51364ebd99a3503e79': docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
| | | * \ \ \ \ \ \ \ \ \ Merge "docs: change intro and title for contacts and sign-in lesson, and ↵Cheryl Potter2015-09-083-6/+5
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove empty bullet" into mnc-preview-docs
| | | | * | | | | | | | | | docs: change intro and title for contacts and sign-in lesson, and remove ↵Cheryl Potter2015-09-083-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | empty bullet b/22822607 Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20
* | | | | | | | | | | | | | am 9e28efe4: docs: change intro and title for contacts and sign-in lesson, ↵Cheryl Potter2015-09-083-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | / / / / / / / / / | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and remove empty bullet * commit '9e28efe4e79402e1ae9c92579d4ea2bc5b4bb664': docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
| * | | | | | | | | | | | docs: change intro and title for contacts and sign-in lesson, and remove ↵Cheryl Potter2015-09-083-6/+5
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | empty bullet b/22822607 Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20
* | | | | | | | | | | | am 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in ↵Cheryl Potter2015-09-041-33/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to Google sign-in" into mnc-preview-docs * commit '4afcda743d0ba14ee0d3449e7f15518f3cc538dc': docs: changed references to Google+ sign-in to Google sign-in
| * | | | | | | | | | | am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google ↵Cheryl Potter2015-09-041-33/+17
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sign-in" into mnc-preview-docs * commit '79ad6310ea3ca5931013cf746babf55cf391cc8f': docs: changed references to Google+ sign-in to Google sign-in
| | * | | | | | | | | | Merge "docs: changed references to Google+ sign-in to Google sign-in" into ↵Cheryl Potter2015-09-041-33/+17
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-preview-docs
| | | * | | | | | | | | | docs: changed references to Google+ sign-in to Google sign-inCheryl Potter2015-08-211-33/+17
| | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/23121450 Change-Id: I61f8b05da94e81c23792a1a06ee125f35b7c88fb
* | | | | | | | | | | | am a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc.Renato Mangini2015-09-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a8b9a2b7aeab97f71ff876319d807d9f151c6065': Minor fix on Auto Desktop Head Unit doc.
| * | | | | | | | | | | am 81e0dff0: Minor fix on Auto Desktop Head Unit doc.Renato Mangini2015-09-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '81e0dff0da637f3580ac81e86950b23e9a55bbdc': Minor fix on Auto Desktop Head Unit doc.
| | * | | | | | | | | | Minor fix on Auto Desktop Head Unit doc.Renato Mangini2015-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I245484e87fadcc98fabc6f4c4fc67f2b454f9874
* | | | | | | | | | | | Merge "Don't crash on (invalid) hardware address lengths > 127." into mnc-devIan Pedowitz2015-09-032-2/+83
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Don't crash on (invalid) hardware address lengths > 127.Lorenzo Colitti2015-09-032-2/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These would cause us to crash with a NegativeArraySizeException when trying to create the clientMac array. Instead, if the length is > 16 (invalid, because the field is only 16 bytes long), fudge it to 6 (Ethernet / wifi). This is a bit less liberal than the legacy client, which doesn't check the length at all. Bug: 23725795 Change-Id: I83f47bfc400ffa8ce85dd9d1b8eb96be5afe51a5
* | | | | | | | | | | | | Merge "Don't drop runtime permissions on older system app update." into mnc-devSvetoslav Ganov2015-09-031-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Don't drop runtime permissions on older system app update.Svetoslav2015-09-021-6/+0
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a device with an installed version of an app that is not preinstalled and has some runtime permissions granted. Now we get OTA with an older version of the app which does not request these runtime permissions. We first scan system packages and then installed apps. During the scan we encounter the newly appeared system package and determine it is older than the one we have installed and disable it. However, before we disable the package we update the permissions for this package but since the one on the system partition (the one we found so far) doesn't request some of the runtime permissions granted to the installed version of the app, they get dropped on the floor. This grant attempt is not necessary as the permission the installed package has depends entirely on the permissions it requests. In this process we may look at the requested permissions on the disabled system package but in general the updated package cannot have a permission that it does not request regardless whether the disabled system app requests it or on. bug:23718806 Change-Id: I187bc11750eb270c3233c314992186f5d58d9d82
* | | | | | | | | | | | | Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." ↵Wale Ogunwale2015-09-032-10/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | | | | | | | Respect DONT_KILL_APP flag when bringing down a disabled service.Wale Ogunwale2015-09-022-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 540e123 introduce logic to clean up states when a component is disabled. For services this included marking the process running the service as removed so it can be killed later. However, this wasn't respecting the Intent.EXTRA_DONT_KILL_APP flag where the caller doesn't want the process of the disabled component to be killed. This change now takes the flag into account. Bug: 23491822 Bug: 15804187 Change-Id: I54a6e03cd66164dc8c4606a3c462114fe661ea8e
* | | | | | | | | | | | | | Apply default link-handling policy at OTA from pre-MChristopher Tate2015-09-021-9/+13
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not just at first (wiped) boot. Bug 23744303 Change-Id: I9ab42f7b081e92231d89b3c97935135c3dd901d4
* | | | | | | | | | | | | Merge "Allow shell to disable keyguard when not secure" into mnc-devTim Kilbourn2015-09-021-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Allow shell to disable keyguard when not secureTim Kilbourn2015-09-011-0/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22694837 Change-Id: I0f08048f617d064017468f331a5c6875ab27174b
* | | | | | | | | | | | | Merge "Fix Custom action mode menu item onclick is not working" into mnc-devClara Bayarri2015-09-021-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix Custom action mode menu item onclick is not workingClara Bayarri2015-09-011-1/+10
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 23575152 Change-Id: I7c07a769bd03c2d756e04f16296f418e965a993f
* | | | | | | | | | | | | Merge "Fixed a crash in the notification group manager" into mnc-devSelim Cinek2015-09-021-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed a crash in the notification group managerSelim Cinek2015-09-021-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When 2 notifications were posted as the summary of the same group, then the system would eventually crash. Bug: 23676310 Change-Id: Ia8f95e624f3f43d1b55169dd8102e3c89427dc76
* | | | | | | | | | | | | | am eb541727: am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching.Deepanshu Gupta2015-09-021-19/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | / / / / / / / / / / / | | |/ / / / / / / / / / / | |/| | | | | | | | | | | * commit 'eb54172719db60740a0b8dde6380db54d4006159': LayoutLib: Fix typedArray caching.
| * | | | | | | | | | | | am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching.Deepanshu Gupta2015-09-011-19/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dd21212fa1a9c907d5d2f80f3de2413f6c14da7a': LayoutLib: Fix typedArray caching.
| | * | | | | | | | | | | am eb26f5ce: LayoutLib: Fix typedArray caching.Deepanshu Gupta2015-09-011-19/+27
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eb26f5cecd5366b29b3cb746a7edaf3769f40480': LayoutLib: Fix typedArray caching.
| | | * | | | | | | | | | LayoutLib: Fix typedArray caching.Deepanshu Gupta2015-09-011-19/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The typedArray depends on the current context (more specifically, the themes set on the context). The fact was ignored in the caching of the typedArray and caused the android:theme attribute to be ignored in certain cases. Change-Id: If095580919474f12c0eb4e1f8fb7f076cf3c4ed0
* | | | | | | | | | | | | Merge "Don't perform layout while adjusting displays/stacks state." into mnc-devFilip Gruszczynski2015-09-012-7/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Don't perform layout while adjusting displays/stacks state.Filip Gruszczynski2015-08-312-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we detach the stack from the display we are in an inconsistent state. We need to finish that operation, before we start laying out things again. Otherwise we will encounter subtle bugs, where stack is partially closed, but still used during the layout. Display detachment was already doing the right thing and scheduling a layout after it finishes the display detach. However, removing the stack's windows was triggering immediate relayout and causing a crash. This CL also adds some missing synchronization around WindowManagerService.mStackIdToStack, which is in most cases protected by mWindowMap. Bug: 22191609 Bug: 23615329 Change-Id: I1e2fc42e1a5b673be808acdec473f85f138d7062
* | | | | | | | | | | | | | Merge "DO NOT MERGE: Fix DngCreator default crop calculations." into mnc-devEino-Ville Talvala2015-09-011-32/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | DO NOT MERGE: Fix DngCreator default crop calculations.Ruben Brunk2015-09-011-32/+22
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23591407 Bug: 23697593 Change-Id: I1b0e46e7371b3db63e8d68230964d09d7537c3ce
* | | | | | | | | | | | | | Merge "Fixed when the notification effects are being cleared" into mnc-devSelim Cinek2015-09-012-10/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed when the notification effects are being clearedSelim Cinek2015-08-312-10/+9
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the notification effects were not correctly cleared in certain cases and the user could end up in a state where the notification light would always blink. Bug: 22931139 Change-Id: I9a71e56cf4479354a9d773b5b6f0edd7693f2b05
* | | | | | | | | | | | | | Incorrect app op check in broadcast queueSvetoslav2015-09-011-1/+1
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An intent broadcaster can specify which permissions should be held by a receiver to get the broadcast. These permissions may have corresponding app ops and if this is the case we also check the app ops. There is a bug in broadcast queue where if a permission does not have an app op we still try to check this app op and get an exception as the app op does not exist. This did not manifest often because the broadcast API takes an optional app op against which is compared the app op for each permission and if they differ the app op for the permission is checked. bug:23725305 Change-Id: Iec56ee354bbc11e7bc245134cf3afd2c11eecbc4
* | | | | | | | | | | | | Merge "Ensure host is set before onInflate()" into mnc-devTodd Kennedy2015-08-311-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Ensure host is set before onInflate()Todd Kennedy2015-08-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22512520 Change-Id: I70f3b3c3234d7015880e0b83ae13f6fbe218f19a
* | | | | | | | | | | | | | am 74890df7: (-s ours) am 3cb7e91f: am 199c74ea: Merge "DO NOT MERGE. ↵Bart Sears2015-08-310-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev * commit '74890df7267d1c203fdbc5e90052f723a3c89f3d': DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
| * | | | | | | | | | | | | am 3cb7e91f: am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app ↵Bart Sears2015-08-311-2/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name if too long for dialog." into lmp-mr1-dev * commit '3cb7e91f2cd1fb29e6d0926e35f90647200c1af4': DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
| | * | | | | | | | | | | | am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too ↵Bart Sears2015-08-311-2/+54
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | long for dialog." into lmp-mr1-dev * commit '199c74eab1a30bff7db7bb4d24c161f36edb7f5b': DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
generated by cgit v1.1 at 2025-02-10 02:34:22 +0000