frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
...
\| \| \| * \| \| \| \| \| \| \| \| \|	am 8b297fb6: (-s ours) am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "I...	Baligh Uddin	2014-02-20	0	-0/+0
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / / /
\| \| \| \| * \| \| \| \| \| \| \| \|	am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO ...	Baligh Uddin	2014-02-20	0	-0/+0
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \|/ / / / / / / /
\| \| \| \| \| * \| \| \| \| \| \| \|	am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev	Baligh Uddin	2014-02-20	0	-0/+0
\| \| \| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \|/ / / / / / /
\| \| \| \| \| \| * \| \| \| \| \| \|	Merge "Import translations. DO NOT MERGE" into klp-dev	Baligh Uddin	2014-02-20	1	-1/+1
\| \| \| \| \| \| \|\ \ \ \ \ \ \
\| \| \| \| \| \| \| * \| \| \| \| \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-02-19	1	-1/+1
\| \| \| \| \| \| \| \|/ / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	am 54de3ec2: (-s ours) am 72edb1b7: (-s ours) am 699991c8: (-s ours) am 08394...	Baligh Uddin	2014-02-20	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	am 72edb1b7: (-s ours) am 699991c8: (-s ours) am 08394af2: (-s ours) am e69b7...	Baligh Uddin	2014-02-20	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \|	am 699991c8: (-s ours) am 08394af2: (-s ours) am e69b7b34: (-s ours) am 46a02...	Baligh Uddin	2014-02-20	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / /
\| \| \| * \| \| \| \| \| \| \| \| \|	am 08394af2: (-s ours) am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "I...	Baligh Uddin	2014-02-20	0	-0/+0
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / / /
\| \| \| \| * \| \| \| \| \| \| \| \|	am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO ...	Baligh Uddin	2014-02-20	0	-0/+0
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \|/ / / / / / / /
\| \| \| \| \| * \| \| \| \| \| \| \|	am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev	Baligh Uddin	2014-02-20	0	-0/+0
\| \| \| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \|/ / / / / / /
\| \| \| \| \| \| * \| \| \| \| \| \|	Merge "Import translations. DO NOT MERGE" into klp-dev	Baligh Uddin	2014-02-20	2	-5/+5
\| \| \| \| \| \| \|\ \ \ \ \ \ \
\| \| \| \| \| \| \| * \| \| \| \| \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-02-19	2	-5/+5
\| \| \| \| \| \| \| \|/ / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	am 7d236199: (-s ours) am 21c5c8e6: am 9edf7a11: am 2cb9147f: am 55542ee6: am...	Xavier Ducrohet	2014-02-20	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	am 21c5c8e6: am 9edf7a11: am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set d...	Xavier Ducrohet	2014-02-20	1	-0/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \|	am 9edf7a11: am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text s...	Xavier Ducrohet	2014-02-20	1	-0/+3
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / /
\| \| \| * \| \| \| \| \| \| \| \| \|	am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in layou...	Xavier Ducrohet	2014-02-20	1	-0/+3
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / / /
\| \| \| \| * \| \| \| \| \| \| \| \|	am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMA...	Xavier Ducrohet	2014-02-20	1	-0/+3
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \|/ / / / / / / /
\| \| \| \| \| * \| \| \| \| \| \| \|	am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MER...	Xavier Ducrohet	2014-02-20	1	-0/+3
\| \| \| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \|/ / / / / / /
\| \| \| \| \| \| * \| \| \| \| \| \|	Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp...	Xavier Ducrohet	2014-02-20	1	-0/+3
\| \| \| \| \| \| \|\ \ \ \ \ \ \
\| \| \| \| \| \| \| * \| \| \| \| \| \|	Set default text style in layoutlib as NORMAL [DO NOT MERGE]	Deepanshu Gupta	2014-02-19	1	-0/+3
\| \| \| \| \| \| \| \|/ / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	am 7b5d0a82: (-s ours) am c139177b: am 65521c3c: am ca4b9a77: am e92c8542: am...	Deepanshu Gupta	2014-02-20	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	am c139177b: am 65521c3c: am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-ser...	Deepanshu Gupta	2014-02-20	1	-3/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \|	am 65521c3c: am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and s...	Deepanshu Gupta	2014-02-20	1	-3/+5
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / /
\| \| \| * \| \| \| \| \| \| \| \| \|	am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-lig...	Deepanshu Gupta	2014-02-20	1	-3/+5
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / / /
\| \| \| \| * \| \| \| \| \| \| \| \|	am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in l...	Deepanshu Gupta	2014-02-20	1	-3/+5
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \|/ / / / / / / /
\| \| \| \| \| * \| \| \| \| \| \| \|	am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO...	Deepanshu Gupta	2014-02-20	1	-3/+5
\| \| \| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \|/ / / / / / /
\| \| \| \| \| \| * \| \| \| \| \| \|	Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]	Deepanshu Gupta	2014-02-19	1	-3/+5
\| \| \| \| \| \| \|/ / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	am 7206ac56: am a79ac472: am 744d3473: Merge "Add hardware feature describing...	Justin Koh	2014-02-20	2	-0/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	am a79ac472: am 744d3473: Merge "Add hardware feature describing a watch." in...	Justin Koh	2014-02-20	2	-0/+10
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \|	am 744d3473: Merge "Add hardware feature describing a watch." into klp-modula...	Justin Koh	2014-02-20	2	-0/+10
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / /
\| \| \| * \| \| \| \| \| \| \| \|	Merge "Add hardware feature describing a watch." into klp-modular-dev	Justin Koh	2014-02-20	2	-0/+10
\| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \|	Add hardware feature describing a watch.	Justin Koh	2014-02-18	2	-0/+10
* \| \| \| \| \| \| \| \| \| \| \|	Merge "Fix density in touch feedback drawable"	Alan Viverette	2014-02-20	2	-32/+21
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix density in touch feedback drawable	Alan Viverette	2014-02-20	2	-32/+21
* \| \| \| \| \| \| \| \| \| \| \| \|	am 66e30b35: am c95ed621: am fca204a4: am 05cebdc2: Merge "Fix several bad fu...	Narayan Kamath	2014-02-20	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	am c95ed621: am fca204a4: am 05cebdc2: Merge "Fix several bad function defini...	Narayan Kamath	2014-02-20	2	-9/+10
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions."	Narayan Kamath	2014-02-20	2	-9/+10
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \ \	am 05cebdc2: Merge "Fix several bad function definitions."	Narayan Kamath	2014-02-20	2	-9/+10
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| \| * \ \ \ \ \ \ \ \ \ \	Merge "Fix several bad function definitions."	Narayan Kamath	2014-02-20	2	-9/+10
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| \| \| * \| \| \| \| \| \| \| \| \| \|	Fix several bad function definitions.	Narayan Kamath	2014-02-20	2	-9/+10
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am fb7b3181: (-s ours) am 520a5673: am b152473f: am 9fce8535: Merge "AArch64:...	Narayan Kamath	2014-02-20	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / \| \| \| \| \| \| / / / / / / / / / / \| \|_\|_\|_\|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	am 520a5673: am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService...	Narayan Kamath	2014-02-20	8	-58/+61
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compa...	Narayan Kamath	2014-02-20	8	-58/+61
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / / /
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible"	Narayan Kamath	2014-02-20	8	-58/+61
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / / / / /
\| \| \| \| * \| \| \| \| \| \| \| \| \| \|	Merge "AArch64: Make AssetAtlasService 64-bit compatible"	Narayan Kamath	2014-02-20	8	-58/+61
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \|/ / / / / / / / / / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \| \| \| \| \| \| \|	AArch64: Make AssetAtlasService 64-bit compatible	Ashok Bhat	2014-02-20	8	-58/+61
\| \| \| \| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \|	am bcb433b4: am b1903653: am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix ...	Narayan Kamath	2014-02-20	1	-39/+36
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \|	am b1903653: am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error f...	Narayan Kamath	2014-02-20	1	-39/+36
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \|	am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit"	Narayan Kamath	2014-02-20	1	-39/+36
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / /