summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 91281bbd: resolved conflicts for merge of cc86bc0c to lmp-mr1-modular-devBart Sears2015-03-181-11/+23
|\ | | | | | | | | * commit '91281bbdde1d8bcec993ff61044a5aa4897f3175': Prevent activities from being started during setup wizard.
| * resolved conflicts for merge of cc86bc0c to lmp-mr1-modular-devBart Sears2015-03-181-11/+23
| |\ | | | | | | | | | Change-Id: Ifb6c4ec5560c50a4bb91426734d7e05cd0c46e93
| | * am c2eb5c60: Merge "Prevent activities from being started during setup ↵Bart Sears2015-03-181-11/+23
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | wizard." into lmp-mr1-dev * commit 'c2eb5c602d36d91483c8f24b0c6859e4283724b4': Prevent activities from being started during setup wizard.
| | | * Merge "Prevent activities from being started during setup wizard." into ↵Bart Sears2015-03-181-11/+23
| | | |\ | | | | | | | | | | | | | | | lmp-mr1-dev
| | | | * Prevent activities from being started during setup wizard.Michael Wright2015-03-131-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19677145 Change-Id: I1d7ca7b25077652355aa55848f973efa69d4b654
* | | | | am 13dbc3d4: Merge "Frameworks/base: Fix potential NPE in InputMethod"Andreas Gampe2015-03-181-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '13dbc3d48d1c4ea8854f952f9ced4b7617ae5e87': Frameworks/base: Fix potential NPE in InputMethod
| * \ \ \ \ Merge "Frameworks/base: Fix potential NPE in InputMethod"Andreas Gampe2015-03-181-2/+2
| |\ \ \ \ \
| | * | | | | Frameworks/base: Fix potential NPE in InputMethodAndreas Gampe2015-03-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't read the size of an unchecked list. Bug: 19797138 Change-Id: I9d8c087aff7bc9cc1e8aae9a0b489e23b5442765
* | | | | | | am 9cc36ac2: Merge "Frameworks/base: Remove duplicate check in Mesh"Andreas Gampe2015-03-181-3/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '9cc36ac2a2e07f81a9b11da7ff08e0da58b0143e': Frameworks/base: Remove duplicate check in Mesh
| * | | | | | Merge "Frameworks/base: Remove duplicate check in Mesh"Andreas Gampe2015-03-181-3/+1
| |\ \ \ \ \ \
| | * | | | | | Frameworks/base: Remove duplicate check in MeshAndreas Gampe2015-03-171-3/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19797138 Change-Id: I0b11c4ff63a8031d5e58a06ac13f91ae0bbac5dc
* | | | | | | am 2a247b36: Merge "Frameworks/base: Fix visibility flag in Editor"Andreas Gampe2015-03-181-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '2a247b361089c0744202b604e22f9a79d239b92c': Frameworks/base: Fix visibility flag in Editor
| * | | | | | Merge "Frameworks/base: Fix visibility flag in Editor"Andreas Gampe2015-03-181-1/+1
| |\ \ \ \ \ \
| | * | | | | | Frameworks/base: Fix visibility flag in EditorAndreas Gampe2015-03-171-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix double check. Bug: 19797138 Change-Id: I95e694f384f1f25d6cf3b6a1669052940385e41d
* | | | | | | am 8df1bedc: Merge "Frameworks/base: Fix potential NPE in Script"Andreas Gampe2015-03-181-3/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '8df1bedcba5bf146c49ba6b6a89e4f97c018045c': Frameworks/base: Fix potential NPE in Script
| * | | | | | Merge "Frameworks/base: Fix potential NPE in Script"Andreas Gampe2015-03-181-3/+8
| |\ \ \ \ \ \
| | * | | | | | Frameworks/base: Fix potential NPE in ScriptAndreas Gampe2015-03-181-3/+8
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19797138 Change-Id: I5cd9394bd2c0f7c044c1f2f24665384fa797cd97
* | | | | | | am e2c8e504: Merge "logd: optimize statistics"Mark Salyzyn2015-03-181-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'e2c8e504d143c42c25d7e61a18f50cccb80f0c4d': logd: optimize statistics
| * | | | | | Merge "logd: optimize statistics"Mark Salyzyn2015-03-181-0/+1
| |\ \ \ \ \ \
| | * | | | | | logd: optimize statisticsMark Salyzyn2015-03-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | logd reads /data/system/packages.xml (because it also contains shared UIDs) and is sensitive to line break and tag name issues. Bug: 19608965 Change-Id: I2a4a6bcfb10529e4b29c9664cbbf12842e689dd1
* | | | | | | | am 1aadd347: Merge "Avoid duplicate surface creation."Jason Sams2015-03-181-1/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '1aadd3474177e6946ea0aae03f0628e436d0cf87': Avoid duplicate surface creation.
| * | | | | | | Merge "Avoid duplicate surface creation."Jason Sams2015-03-181-1/+8
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Avoid duplicate surface creation.Jason Sams2015-03-171-1/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I43104c8b48dd26681735940e6b2e1ba902af2020
* | | | | | | am fbd99e9f: am 76620791: am b3a1b663: Merge "Avoid crashing on corrupted ↵Dan Sandler2015-03-181-1/+2
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notifications." into lmp-mr1-dev * commit 'fbd99e9fecea1cf467c082d2096cb1c3868685d4': Avoid crashing on corrupted notifications.
| * | | | | | am 76620791: am b3a1b663: Merge "Avoid crashing on corrupted notifications." ↵Dan Sandler2015-03-181-1/+2
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '76620791600af3b3d6f6ad8ba3534320265153db': Avoid crashing on corrupted notifications.
| | * | | | | am b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-devDan Sandler2015-03-181-1/+2
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | * commit 'b3a1b6632e403926fed995e851a8e44fc944c663': Avoid crashing on corrupted notifications.
| | | * | | | Merge "Avoid crashing on corrupted notifications." into lmp-mr1-devDan Sandler2015-03-181-1/+2
| | | |\ \ \ \
| | | | * | | | Avoid crashing on corrupted notifications.Dan Sandler2015-03-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a notification content view has an @id/icon or @id/right_icon, we need to make sure those ImageViews actually have a drawable inside. Bug: 19487078 Change-Id: I4ef6c4a10926823aa8680628097ed150d9e717d4
* | | | | | | | am 1265575d: am 96693b29: am 8d3f587f: am 57c24fbb: am 2fc33a00: am ↵Rich Slogar2015-03-181-12/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ddc44153: docs: downloads for sdk 24.1.2 * commit '1265575d8a31f415606cccc39b24466ecae5731d': docs: downloads for sdk 24.1.2
| * | | | | | | am 96693b29: am 8d3f587f: am 57c24fbb: am 2fc33a00: am ddc44153: docs: ↵Rich Slogar2015-03-181-12/+12
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | downloads for sdk 24.1.2 * commit '96693b29774713d156fd035cda174cfd7b4d9b65': docs: downloads for sdk 24.1.2
| | * | | | | | am 8d3f587f: am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk ↵Rich Slogar2015-03-181-12/+12
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24.1.2 * commit '8d3f587f15016d193e4739e3893b77e11336b498': docs: downloads for sdk 24.1.2
| | | * | | | | am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2Rich Slogar2015-03-181-12/+12
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '57c24fbb90dd7b342b06e2daecc1033f92d730da': docs: downloads for sdk 24.1.2
| | | | * \ \ \ \ am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2Rich Slogar2015-03-181-12/+12
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2fc33a008c02cf408e1d270972bbf681c7a36785': docs: downloads for sdk 24.1.2
| | | | | * \ \ \ \ am ddc44153: docs: downloads for sdk 24.1.2Rich Slogar2015-03-181-12/+12
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ddc44153295174e8195286c21d7edcd3962b3661': docs: downloads for sdk 24.1.2
| | | | | | * | | | | docs: downloads for sdk 24.1.2Rich Slogar2015-03-171-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b.android 160727 Change-Id: I112badc736ce4b85fabe0b702a2b24800ee589bd
* | | | | | | | | | | am b48d3ce0: (-s ours) am 54064f66: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b48d3ce076233a2da0b2146882c2e22a332fc665': Import translations. DO NOT MERGE
| * | | | | | | | | | am 54064f66: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '54064f66c949fa4069b4abb025c31afe28ac98ab': Import translations. DO NOT MERGE
| | * | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-181-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifd3f512fcd1aabd685f10218eceda8f4f83bb116 Auto-generated-cl: translation import
* | | | | | | | | | | am 58ba39ed: am 94573dc5: am 89f41eb3: Define the capability to speed up MT ↵Dong Zhou2015-03-182-1/+19
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | call audio * commit '58ba39ed86798c3d0877e0ed6bdf09c74007c36f': Define the capability to speed up MT call audio
| * | | | | | | | | | am 94573dc5: am 89f41eb3: Define the capability to speed up MT call audioDong Zhou2015-03-182-1/+19
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '94573dc5515d69458effc92b66922f757adde4d0': Define the capability to speed up MT call audio
| | * | | | | | | | | am 89f41eb3: Define the capability to speed up MT call audioDong Zhou2015-03-172-1/+19
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '89f41eb39e910e220957ac861651ead17eff9085': Define the capability to speed up MT call audio
| | | * | | | | | | | Define the capability to speed up MT call audioDong Zhou2015-03-172-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19656525 Change-Id: I0bc88e85b807871b2883a785efac91bd0e1f6d8d
* | | | | | | | | | | resolved conflicts for merge of c3f497ae to lmp-mr1-dev-plus-aospKenny Root2015-03-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 4ff668d4: Track change to ConscryptKenny Root2015-03-184-34/+4
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4ff668d47ab9f49ec81606aec6d469ecd6ca37fa': Track change to Conscrypt
| | * | | | | | | | | Track change to ConscryptKenny Root2015-03-174-34/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 9d2d6b6b4b1b16221cbd857703cd6301c6bf873c) Bug: 19798387 Change-Id: I8814fd0720acf09332927f184fdd9b2cdac4f413
* | | | | | | | | | | resolved conflicts for merge of fb9ff42d to lmp-mr1-dev-plus-aospKenny Root2015-03-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifff03303c62aeba576974b877988b3a479945aa2
| * | | | | | | | | | am fbd8805c: Merge "Track change to Conscrypt" into lmp-mr1-ub-devKenny Root2015-03-183-4/+4
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fbd8805cd783e34aebf521913aeab6cfd483b7b2': Track change to Conscrypt
| | * | | | | | | | | Merge "Track change to Conscrypt" into lmp-mr1-ub-devKenny Root2015-03-173-4/+4
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Track change to ConscryptKenny Root2015-03-173-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change way in which an outside caller can get the preferred SSLContext. (cherry picked from commit 8a970637208207955fb6a719bd82902384b3c743) Bug: 19798387 Bug: 17136008 Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
* | | | | | | | | | | | am c0ca0de7: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-03-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-modular-dev * commit 'c0ca0de76e2a8b72ecc4068fcf5dfbef519e7ca6': Import translations. DO NOT MERGE
generated by cgit v1.1 at 2024-09-10 23:41:26 +0000