frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am f74ae93c: am bc6f59a1: Merge "VolumeZen: Introduce internal vs external ri...	John Spurlock	2014-11-26	7	-69/+186
\|\
\| *	am bc6f59a1: Merge "VolumeZen: Introduce internal vs external ringer mode." i...	John Spurlock	2014-11-25	7	-69/+186
\| \|\
\| \| *	VolumeZen: Introduce internal vs external ringer mode.	John Spurlock	2014-11-25	7	-69/+186
* \| \|	am 48956f26: am f51d7015: Merge "Lockup in the print spooler." into lmp-mr1-dev	Svet Ganov	2014-11-25	4	-13/+33
\|\ \ \ \| \|/ /
\| * \|	am f51d7015: Merge "Lockup in the print spooler." into lmp-mr1-dev	Svet Ganov	2014-11-25	4	-13/+33
\| \|\ \ \| \| \|/
\| \| *	Merge "Lockup in the print spooler." into lmp-mr1-dev	Svet Ganov	2014-11-25	4	-13/+33
\| \| \|\
\| \| \| *	Lockup in the print spooler.	Svet Ganov	2014-11-24	4	-13/+33
* \| \| \|	am ce7a0e6c: am 7038c390: Merge "Move Documents action bar update even later....	Jeff Sharkey	2014-11-25	2	-3/+3
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 7038c390: Merge "Move Documents action bar update even later." into lmp-mr...	Jeff Sharkey	2014-11-24	2	-3/+3
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge "Move Documents action bar update even later." into lmp-mr1-dev	Jeff Sharkey	2014-11-24	2	-3/+3
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|
\| \| \| *	Move Documents action bar update even later.	Jeff Sharkey	2014-11-24	2	-3/+3
\| \| * \|	Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev	Geoff Mendal	2014-11-24	3	-5/+5
\| \| \|\ \
\| \| \| * \|	Import translations. DO NOT MERGE	Geoff Mendal	2014-11-24	3	-5/+5
\| * \| \| \|	Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev	Geoff Mendal	2014-11-24	20	-667/+907
\| \|\ \ \ \
\| \| * \| \| \|	Import translations. DO NOT MERGE	Geoff Mendal	2014-11-24	20	-667/+907
* \| \| \| \| \|	am 58b699c3: am 636baa0d: Merge "Introduce revision codes for split APKs." in...	Jeff Sharkey	2014-11-25	1	-0/+3
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev	Jeff Sharkey	2014-11-24	1	-0/+3
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	Merge "Introduce revision codes for split APKs." into lmp-mr1-dev	Jeff Sharkey	2014-11-24	1	-0/+3
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| \| \| * \| \|	Introduce revision codes for split APKs.	Jeff Sharkey	2014-11-24	1	-0/+3
* \| \| \| \| \|	am 82bb648b: am 6b770744: Merge "Fix quick settings on Keyguard" into lmp-mr1...	Jorim Jaggi	2014-11-25	3	-13/+54
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 6b770744: Merge "Fix quick settings on Keyguard" into lmp-mr1-dev	Jorim Jaggi	2014-11-24	3	-13/+54
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Merge "Fix quick settings on Keyguard" into lmp-mr1-dev	Jorim Jaggi	2014-11-24	3	-13/+54
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| \| * \| \|	Fix quick settings on Keyguard	Jorim Jaggi	2014-11-24	3	-13/+54
\| \| \| \| \|/ \| \| \| \|/\|
* \| \| \| \|	am 98a20f68: am 4dfce43e: Merge "QS: Update data usage over limit title." int...	John Spurlock	2014-11-25	1	-1/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 4dfce43e: Merge "QS: Update data usage over limit title." into lmp-mr1-dev	John Spurlock	2014-11-24	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "QS: Update data usage over limit title." into lmp-mr1-dev	John Spurlock	2014-11-24	1	-1/+1
\| \| \|\ \ \
\| \| \| * \| \|	QS: Update data usage over limit title.	John Spurlock	2014-11-24	1	-1/+1
* \| \| \| \| \|	am f34896bb: am c9f499d2: Merge "Print spooler crash when printing after a ro...	Svet Ganov	2014-11-25	3	-71/+109
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am c9f499d2: Merge "Print spooler crash when printing after a rotation." into...	Svet Ganov	2014-11-24	3	-71/+109
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Merge "Print spooler crash when printing after a rotation." into lmp-mr1-dev	Svet Ganov	2014-11-24	3	-71/+109
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Print spooler crash when printing after a rotation.	Svet Ganov	2014-11-22	3	-71/+109
* \| \| \| \| \| \|	am fc4d8043: am f510a8a6: Merge "Tint SIM images in PIN/PUK screen" into lmp-...	Jorim Jaggi	2014-11-25	4	-0/+22
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am f510a8a6: Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev	Jorim Jaggi	2014-11-24	4	-0/+22
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev	Jorim Jaggi	2014-11-24	4	-0/+22
\| \| \|\ \ \ \ \
\| \| \| * \| \| \| \|	Tint SIM images in PIN/PUK screen	Jorim Jaggi	2014-11-20	4	-0/+22
* \| \| \| \| \| \| \|	am 20eb594a: am 8a924242: Merge "Revert "Only keep user switcher bitmaps if n...	Adrian Roos	2014-11-25	3	-57/+14
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	am 8a924242: Merge "Revert "Only keep user switcher bitmaps if needed"" into ...	Adrian Roos	2014-11-24	3	-57/+14
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev	Adrian Roos	2014-11-24	3	-57/+14
\| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \|	Revert "Only keep user switcher bitmaps if needed"	Adrian Roos	2014-11-21	3	-57/+14
* \| \| \| \| \| \| \| \|	am 865c73b5: am 1aa63f0b: Merge "Push back notification means snooze the pack...	Chris Wren	2014-11-25	4	-6/+90
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	am 1aa63f0b: Merge "Push back notification means snooze the package." into lm...	Chris Wren	2014-11-24	4	-6/+90
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / /
\| \| * \| \| \| \| \| \|	Merge "Push back notification means snooze the package." into lmp-mr1-dev	Chris Wren	2014-11-24	4	-6/+90
\| \| \|\ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	Push back notification means snooze the package.	Chris Wren	2014-11-21	4	-6/+90
\| \| * \| \| \| \| \| \| \|	Import translations. DO NOT MERGE	Geoff Mendal	2014-11-24	72	-517/+2203
\| \| \| \|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Import translations. DO NOT MERGE	Geoff Mendal	2014-11-24	72	-517/+2203
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp	Jorim Jaggi	2014-11-25	5	-14/+33
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	am 962b06f9: Merge "Fixed several time related states for secondary users" in...	Selim Cinek	2014-11-24	5	-14/+33
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Merge "Fixed several time related states for secondary users" into lmp-mr1-dev	Selim Cinek	2014-11-24	5	-14/+33
\| \| \|\ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
\| \| \| * \| \| \| \|	Fixed several time related states for secondary users	Selim Cinek	2014-11-21	5	-14/+33
* \| \| \| \| \| \| \|	am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager AP...	Wink Saville	2014-11-24	5	-23/+36
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /