summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | | | | am 8b297fb6: (-s ours) am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge ↵Baligh Uddin2014-02-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into klp-dev * commit '8b297fb6ef42650a1126287aa0b610aa9a503167': Import translations. DO NOT MERGE
| | | | * | | | | | | | | am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2014-02-200-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into klp-dev * commit '8027100fdb13c046838f9af12ef7bf2bc3ad511f': Import translations. DO NOT MERGE
| | | | | * | | | | | | | am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-200-0/+0
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e9adafd1b95a7934bb813cb168e33a85a762a504': Import translations. DO NOT MERGE
| | | | | | * | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-201-1/+1
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-191-1/+1
| | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3003f43c32943496e855ba2744a7492232dbd56b Auto-generated-cl: translation import
* | | | | | | | | | | | | am 54de3ec2: (-s ours) am 72edb1b7: (-s ours) am 699991c8: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08394af2: (-s ours) am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '54de3ec25b309f51f4a05438fd0089d713cd5309': Import translations. DO NOT MERGE
| * | | | | | | | | | | | am 72edb1b7: (-s ours) am 699991c8: (-s ours) am 08394af2: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '72edb1b78d0316055b40931138ee75a99766995d': Import translations. DO NOT MERGE
| | * | | | | | | | | | | am 699991c8: (-s ours) am 08394af2: (-s ours) am e69b7b34: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '699991c8a296834e8fe843bce85529b018d12af8': Import translations. DO NOT MERGE
| | | * | | | | | | | | | am 08394af2: (-s ours) am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge ↵Baligh Uddin2014-02-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into klp-dev * commit '08394af265b02db7a76c4f4f4ae16b9d238e7580': Import translations. DO NOT MERGE
| | | | * | | | | | | | | am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2014-02-200-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into klp-dev * commit 'e69b7b3474c356438fbd65e43438e72ebda0bacb': Import translations. DO NOT MERGE
| | | | | * | | | | | | | am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-200-0/+0
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '46a02249d7bde3fb88cc5312f88dab6d1690e20e': Import translations. DO NOT MERGE
| | | | | | * | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-202-5/+5
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-192-5/+5
| | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I31e5b7b7aa453a0455fd31eca6a11520730a26a7 Auto-generated-cl: translation import
* | | | | | | | | | | | | am 7d236199: (-s ours) am 21c5c8e6: am 9edf7a11: am 2cb9147f: am 55542ee6: ↵Xavier Ducrohet2014-02-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev * commit '7d23619918eab43e6a54d9f780a0610e6e237ec3': Set default text style in layoutlib as NORMAL [DO NOT MERGE]
| * | | | | | | | | | | | am 21c5c8e6: am 9edf7a11: am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set ↵Xavier Ducrohet2014-02-201-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev * commit '21c5c8e600d635df1d5bbfb9f4db6d0f60b9e2ad': Set default text style in layoutlib as NORMAL [DO NOT MERGE]
| | * | | | | | | | | | | am 9edf7a11: am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text ↵Xavier Ducrohet2014-02-201-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev * commit '9edf7a1159b528afa056e0d61ee4487ed310fe4c': Set default text style in layoutlib as NORMAL [DO NOT MERGE]
| | | * | | | | | | | | | am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in ↵Xavier Ducrohet2014-02-201-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layoutlib as NORMAL [DO NOT MERGE]" into klp-dev * commit '2cb9147fc49e6474eaf30fd833e43df10e42b899': Set default text style in layoutlib as NORMAL [DO NOT MERGE]
| | | | * | | | | | | | | am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as ↵Xavier Ducrohet2014-02-201-0/+3
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NORMAL [DO NOT MERGE]" into klp-dev * commit '55542ee6449bd580f61bc005726b5c87773fbe25': Set default text style in layoutlib as NORMAL [DO NOT MERGE]
| | | | | * | | | | | | | am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT ↵Xavier Ducrohet2014-02-201-0/+3
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE]" into klp-dev * commit '3e6370425ea3ac4e5d89ce042512913062212ccc': Set default text style in layoutlib as NORMAL [DO NOT MERGE]
| | | | | | * | | | | | | Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into ↵Xavier Ducrohet2014-02-201-0/+3
| | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev
| | | | | | | * | | | | | | Set default text style in layoutlib as NORMAL [DO NOT MERGE]Deepanshu Gupta2014-02-191-0/+3
| | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a style doesn't specify text style (normal/bold/italic/bold-italic) then default to normal instead of throwing an error. Bug: http://b.android.com/61358 Change-Id: I0138c73807a5ff6e4d938a99ece3044333110aa1 (cherry picked from commit 0acfb16dcd95468fe032204f54618e86becfd1eb)
* | | | | | | | | | | | | am 7b5d0a82: (-s ours) am c139177b: am 65521c3c: am ca4b9a77: am e92c8542: ↵Deepanshu Gupta2014-02-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] * commit '7b5d0a82f65ff83d0c360f47d7506ee22a7b7941': Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
| * | | | | | | | | | | | am c139177b: am 65521c3c: am ca4b9a77: am e92c8542: am 01825b7a: Fix ↵Deepanshu Gupta2014-02-201-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] * commit 'c139177b13427ea3ea1bc88364136439125848af': Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
| | * | | | | | | | | | | am 65521c3c: am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and ↵Deepanshu Gupta2014-02-201-3/+5
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sans-serif-light fonts in layoutlib. [DO NOT MERGE] * commit '65521c3cf169808cd02ce09a7344bc633d51c1fc': Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
| | | * | | | | | | | | | am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and ↵Deepanshu Gupta2014-02-201-3/+5
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sans-serif-light fonts in layoutlib. [DO NOT MERGE] * commit 'ca4b9a77e7d20703287b33b203b2582bd43f7792': Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
| | | | * | | | | | | | | am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in ↵Deepanshu Gupta2014-02-201-3/+5
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layoutlib. [DO NOT MERGE] * commit 'e92c8542a5cf1160a1b701b9f176af64ba46d68d': Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
| | | | | * | | | | | | | am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. ↵Deepanshu Gupta2014-02-201-3/+5
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DO NOT MERGE] * commit '01825b7aa3c864426c78c08c2f6004a8362c2b47': Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
| | | | | | * | | | | | | Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]Deepanshu Gupta2014-02-191-3/+5
| | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For these font families, text was always rendered as italic. This changeset fixes the issue. Bug: http://b.android.com/57221 Change-Id: Ic8a299bd1e555f5bb914cd3d2fe72917ec7f471a (cherry picked from commit e327212adde1136807bbdf052e8cc3861f8a6aba)
* | | | | | | | | | | | am 7206ac56: am a79ac472: am 744d3473: Merge "Add hardware feature ↵Justin Koh2014-02-202-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | describing a watch." into klp-modular-dev * commit '7206ac561291298f08809614be95963966a72ca8': Add hardware feature describing a watch.
| * | | | | | | | | | | am a79ac472: am 744d3473: Merge "Add hardware feature describing a watch." ↵Justin Koh2014-02-202-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-modular-dev * commit 'a79ac472d71de6d13f3561012ca0e870bd9fe04b': Add hardware feature describing a watch.
| | * | | | | | | | | | am 744d3473: Merge "Add hardware feature describing a watch." into ↵Justin Koh2014-02-202-0/+10
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '744d3473f8a0f9f95e3fdf83670faf6d1551839e': Add hardware feature describing a watch.
| | | * | | | | | | | | Merge "Add hardware feature describing a watch." into klp-modular-devJustin Koh2014-02-202-0/+10
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | | | * | | | | | | | Add hardware feature describing a watch.Justin Koh2014-02-182-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add hardware feature describing a watch so that hardware can specify that it is a device that is worn on the body (perhaps the wrist). Change-Id: I9d4cb7e86067f6ad41b39bcc545222b3b0fbf890
* | | | | | | | | | | | Merge "Fix density in touch feedback drawable"Alan Viverette2014-02-202-32/+21
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix density in touch feedback drawableAlan Viverette2014-02-202-32/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I90b08aea9f5ba0a29ae5328960bacebc6c2099d8
* | | | | | | | | | | | | am 66e30b35: am c95ed621: am fca204a4: am 05cebdc2: Merge "Fix several bad ↵Narayan Kamath2014-02-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function definitions." * commit '66e30b357dd105246430d552f4cf4a7cff665abb': Fix several bad function definitions.
| * | | | | | | | | | | | am c95ed621: am fca204a4: am 05cebdc2: Merge "Fix several bad function ↵Narayan Kamath2014-02-202-9/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | definitions." * commit 'c95ed62111e0b8aceda4322011ad019c28987cbc': Fix several bad function definitions.
| | * | | | | | | | | | | am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions."Narayan Kamath2014-02-202-9/+10
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fca204a4b8771b800383c91465a48eb2cd8b3ba2': Fix several bad function definitions.
| | | * \ \ \ \ \ \ \ \ \ \ am 05cebdc2: Merge "Fix several bad function definitions."Narayan Kamath2014-02-202-9/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '05cebdc2abd05b0dca351306cb039245d50c67ae': Fix several bad function definitions.
| | | | * \ \ \ \ \ \ \ \ \ \ Merge "Fix several bad function definitions."Narayan Kamath2014-02-202-9/+10
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | Fix several bad function definitions.Narayan Kamath2014-02-202-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We claim these functions want jlong as input (8 bytes wide) but the definitions use pointer types or jints (4 bytes wide for 32 bit). bug: 12890271 (cherry picked from 017546e65280a3389b6167f5fc3b5d1c3001154a) Change-Id: Iede02be90e6a3c9a2db1fe04dcd0db99abe37097
* | | | | | | | | | | | | | | | am fb7b3181: (-s ours) am 520a5673: am b152473f: am 9fce8535: Merge ↵Narayan Kamath2014-02-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | / / / / / / / / / / | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "AArch64: Make AssetAtlasService 64-bit compatible" * commit 'fb7b3181fc291b17f4376d1163edd32c4fb8cca7': AArch64: Make AssetAtlasService 64-bit compatible
| * | | | | | | | | | | | | | am 520a5673: am b152473f: am 9fce8535: Merge "AArch64: Make ↵Narayan Kamath2014-02-208-58/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AssetAtlasService 64-bit compatible" * commit '520a5673fbe8bff90954045b24a361982861ef8d': AArch64: Make AssetAtlasService 64-bit compatible
| | * | | | | | | | | | | | | am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit ↵Narayan Kamath2014-02-208-58/+61
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compatible" * commit 'b152473f46d8176e7eb2c55b54342a7a29c525cf': AArch64: Make AssetAtlasService 64-bit compatible
| | | * | | | | | | | | | | | am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible"Narayan Kamath2014-02-208-58/+61
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9fce8535851fc696997bd3c251d00e34179d6482': AArch64: Make AssetAtlasService 64-bit compatible
| | | | * | | | | | | | | | | Merge "AArch64: Make AssetAtlasService 64-bit compatible"Narayan Kamath2014-02-208-58/+61
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | | AArch64: Make AssetAtlasService 64-bit compatibleAshok Bhat2014-02-208-58/+61
| | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in this patch include [x] Long(64-bit) is used to store native pointers in AssetAtlasService and related classes as they can be 64-bit. [x] Some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: Ib4c77c134e3ad5b21732e20cde9a54a0b16bdab1 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | | | | | | | | | am bcb433b4: am b1903653: am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix ↵Narayan Kamath2014-02-201-39/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | build error for 64-bit" * commit 'bcb433b43acb424ff7bc6afab03ce12d8cc9a198': libandroidfw: fix build error for 64-bit
| * | | | | | | | | | | | | am b1903653: am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error ↵Narayan Kamath2014-02-201-39/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for 64-bit" * commit 'b1903653e4177a9394d7c30e3834fc8469485325': libandroidfw: fix build error for 64-bit
| | * | | | | | | | | | | | am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit"Narayan Kamath2014-02-201-39/+36
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '128599e4496bd7ceb9d70f4addde0eba65103709': libandroidfw: fix build error for 64-bit
generated by cgit v1.1 at 2024-09-10 23:06:24 +0000