frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "followup fix to conflict resolution in Change-Id: I9cc71d672141c23c0c2...	smain@google.com	2014-12-15	1	-2/+1
\|\
\| *	followup fix to conflict resolution in Change-Id: I9cc71d672141c23c0c2ed0a73d...	smain@google.com	2014-12-15	1	-2/+1
* \|	am 301a6176: (-s ours) am d6fc7cf1: (-s ours) Merge "Import translations. DO ...	Geoff Mendal	2014-12-15	0	-0/+0
\|\ \
\| * \	am 301a6176: (-s ours) am d6fc7cf1: (-s ours) Merge "Import translations. DO ...	Geoff Mendal	2014-12-15	0	-0/+0
\| \|\ \
\| \| * \	am d6fc7cf1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1...	Geoff Mendal	2014-12-15	0	-0/+0
\| \| \|\ \
\| \| \| * \	Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev	Geoff Mendal	2014-12-15	1	-3/+3
\| \| \| \|\ \
\| \| \| \| * \|	Import translations. DO NOT MERGE	Geoff Mendal	2014-12-15	1	-3/+3
* \| \| \| \| \|	am b73e02cf: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1...	Geoff Mendal	2014-12-15	0	-0/+0
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am b73e02cf: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1...	Geoff Mendal	2014-12-15	0	-0/+0
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev	Geoff Mendal	2014-12-15	1	-3/+3
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Import translations. DO NOT MERGE	Geoff Mendal	2014-12-15	1	-3/+3
* \| \| \| \| \| \|	Merge "Import translations. DO NOT MERGE"	Geoff Mendal	2014-12-15	1	-3/+3
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Import translations. DO NOT MERGE	Geoff Mendal	2014-12-15	1	-3/+3
* \| \| \| \| \| \| \|	Merge "Import translations. DO NOT MERGE"	Geoff Mendal	2014-12-15	2	-4/+4
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Import translations. DO NOT MERGE	Geoff Mendal	2014-12-15	2	-4/+4
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	am 0c8802bb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1...	Geoff Mendal	2014-12-15	0	-0/+0
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	am 0c8802bb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1...	Geoff Mendal	2014-12-15	0	-0/+0
\| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \|	Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev	Geoff Mendal	2014-12-15	2	-4/+4
\| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \|	Import translations. DO NOT MERGE	Geoff Mendal	2014-12-15	2	-4/+4
\| \| \| \| \|/ / / / \| \| \| \|/\| \| \| \|
* \| \| \| \| \| \| \|	am b6a5dab3: (-s ours) am feb6c7f3: (-s ours) Import translations. DO NOT MERGE	Geoff Mendal	2014-12-15	0	-0/+0
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	am b6a5dab3: (-s ours) am feb6c7f3: (-s ours) Import translations. DO NOT MERGE	Geoff Mendal	2014-12-15	0	-0/+0
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| \| * \| \| \| \| \|	am feb6c7f3: (-s ours) Import translations. DO NOT MERGE	Geoff Mendal	2014-12-15	0	-0/+0
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| / / / \| \| \| \| \|/ / / \| \| \| \|/\| \| \|
\| \| \| * \| \| \|	Import translations. DO NOT MERGE	Geoff Mendal	2014-12-15	2	-4/+4
\| \| \| \| \|/ / \| \| \| \|/\| \|
* \| \| \| \| \|	Merge "Clean up and fix warnings in LockPatternView: make things final and pr...	Paul Crowley	2014-12-15	1	-19/+22
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|
\| * \| \| \| \|	Clean up and fix warnings in LockPatternView: make things final	Paul Crowley	2014-12-15	1	-19/+22
* \| \| \| \| \|	Add WebView documentation about the layout height parameter.	Marcin Kosiba	2014-12-15	1	-0/+28
\|/ / / / /
* \| \| \| \|	am fa205fff: am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesn...	Prem Kumar	2014-12-14	1	-0/+36
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am fa205fff: am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesn...	Prem Kumar	2014-12-14	1	-0/+36
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesnt grow unboun...	Prem Kumar	2014-12-14	1	-0/+36
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703...	Prem Kumar	2014-12-14	1	-0/+36
\| \| \| \|\ \
\| \| \| \| * \|	make sure wificonfiguration scan cache doesnt grow unbounded	vandwalle	2014-12-11	1	-0/+36
* \| \| \| \| \|	am cb9379ca: am 6c2fa049: Merge "handle beacons reported with wrong RSSI valu...	Prem Kumar	2014-12-14	2	-0/+5
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am cb9379ca: am 6c2fa049: Merge "handle beacons reported with wrong RSSI valu...	Prem Kumar	2014-12-14	2	-0/+5
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	am 6c2fa049: Merge "handle beacons reported with wrong RSSI value of 0 - Bug:...	Prem Kumar	2014-12-14	2	-0/+5
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	Merge "handle beacons reported with wrong RSSI value of 0 - Bug:18654243" int...	Prem Kumar	2014-12-14	2	-0/+5
\| \| \| \|\ \ \ \| \| \| \| \|/ /
\| \| \| \| * \|	handle beacons reported with wrong RSSI value of 0 - Bug:18654243	vandwalle	2014-12-11	2	-0/+5
* \| \| \| \| \|	am d8ca1208: am 07bba9ab: Merge "shell based UI Automator source move" into l...	Guang Zhu	2014-12-14	66	-0/+10078
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am d8ca1208: am 07bba9ab: Merge "shell based UI Automator source move" into l...	Guang Zhu	2014-12-14	66	-0/+10078
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	am 07bba9ab: Merge "shell based UI Automator source move" into lmp-mr1-dev	Guang Zhu	2014-12-14	66	-0/+10078
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	Merge "shell based UI Automator source move" into lmp-mr1-dev	Guang Zhu	2014-12-14	66	-0/+10078
\| \| \| \|\ \ \
\| \| \| \| * \| \|	shell based UI Automator source move	Guang Zhu	2014-12-12	66	-0/+10078
* \| \| \| \| \| \|	am d8858fa9: am a2bc055e: Merge "audioservice: Clear calling identity upon ca...	Jinsuk Kim	2014-12-13	1	-10/+14
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am d8858fa9: am a2bc055e: Merge "audioservice: Clear calling identity upon ca...	Jinsuk Kim	2014-12-13	1	-10/+14
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	am a2bc055e: Merge "audioservice: Clear calling identity upon calling HdmiCon...	Jinsuk Kim	2014-12-13	1	-10/+14
\| \| \|\ \ \ \ \ \| \| \| \|/ / / /
\| \| \| * \| \| \|	Merge "audioservice: Clear calling identity upon calling HdmiControlService" ...	Jinsuk Kim	2014-12-13	1	-10/+14
\| \| \| \|\ \ \ \
\| \| \| \| * \| \| \|	audioservice: Clear calling identity upon calling HdmiControlService	Jinsuk Kim	2014-12-13	1	-10/+14
* \| \| \| \| \| \| \|	am 36ba3e47: am 90c0ae63: Merge "Check which file changed before requesting b...	Christopher Tate	2014-12-13	1	-6/+10
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	am 36ba3e47: am 90c0ae63: Merge "Check which file changed before requesting b...	Christopher Tate	2014-12-13	1	-6/+10
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| \| * \| \| \| \| \|	am 90c0ae63: Merge "Check which file changed before requesting backup" into l...	Christopher Tate	2014-12-13	1	-6/+10
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / /
\| \| \| * \| \| \| \|	Merge "Check which file changed before requesting backup" into lmp-mr1-dev	Christopher Tate	2014-12-13	1	-6/+10
\| \| \| \|\ \ \ \ \