frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am 8fe10b4b: Merge "Volume: Move "Muted by" string from sysui to frameworks."...	John Spurlock	2014-11-14	2	-4/+1
\|\
\| *	am 8fe10b4b: Merge "Volume: Move "Muted by" string from sysui to frameworks."...	John Spurlock	2014-11-14	2	-4/+1
\| \|\
\| \| *	Volume: Move "Muted by" string from sysui to frameworks.	John Spurlock	2014-11-14	2	-4/+1
* \| \|	am 189457c9: Merge "Fixing crash in querying the task stack from a fresh load...	Winson Chung	2014-11-14	4	-7/+20
\|\ \ \ \| \|/ /
\| * \|	am 189457c9: Merge "Fixing crash in querying the task stack from a fresh load...	Winson Chung	2014-11-14	4	-7/+20
\| \|\ \ \| \| \|/
\| \| *	Merge "Fixing crash in querying the task stack from a fresh load plan. (Bug 1...	Winson Chung	2014-11-14	4	-7/+20
\| \| \|\
\| \| \| *	Fixing crash in querying the task stack from a fresh load plan. (Bug 18371946)	Winson Chung	2014-11-13	4	-7/+20
* \| \| \|	am 59ea2612: am 53e52e52: Merge "SysUI: Add basic test coverage for signal le...	Jason Monk	2014-11-14	6	-62/+513
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 53e52e52: Merge "SysUI: Add basic test coverage for signal levels" into lm...	Jason Monk	2014-11-14	6	-62/+513
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge "SysUI: Add basic test coverage for signal levels" into lmp-mr1-dev	Jason Monk	2014-11-14	6	-62/+513
\| \| \|\ \
\| \| \| * \|	SysUI: Add basic test coverage for signal levels	Jason Monk	2014-11-12	6	-62/+513
* \| \| \| \|	am 22c3f906: am 628d2606: Merge "Move ringtone redirection to MediaPlayer." i...	Jeff Sharkey	2014-11-14	1	-74/+2
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 628d2606: Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev	Jeff Sharkey	2014-11-13	1	-74/+2
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev	Jeff Sharkey	2014-11-13	1	-74/+2
\| \| \|\ \ \
\| \| \| * \| \|	Move ringtone redirection to MediaPlayer.	Jeff Sharkey	2014-11-13	1	-74/+2
\| \| \| \| \|/ \| \| \| \|/\|
* \| \| \| \|	am 5b50cd13: Merge "Frameworks/base: Fix build"	Andreas Gampe	2014-11-13	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Frameworks/base: Fix build	Andreas Gampe	2014-11-13	1	-1/+1
* \| \| \| \| \|	am 37079e29: Merge "Frameworks/base: Wall Werror in packages"	Andreas Gampe	2014-11-13	7	-9/+13
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Frameworks/base: Wall Werror in packages	Andreas Gampe	2014-11-13	7	-9/+13
* \| \| \| \| \|	am 338bc5a4: Merge "Zen: Update condition text for current condition." into l...	John Spurlock	2014-11-13	1	-1/+1
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	am 338bc5a4: Merge "Zen: Update condition text for current condition." into l...	John Spurlock	2014-11-13	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	Merge "Zen: Update condition text for current condition." into lmp-mr1-dev	John Spurlock	2014-11-13	1	-1/+1
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Zen: Update condition text for current condition.	John Spurlock	2014-11-13	1	-1/+1
* \| \| \| \| \| \|	am c1bb8620: am a77a37c4: Merge "Fix doze jank by removing a fullscreen layer...	Jorim Jaggi	2014-11-13	4	-192/+315
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am a77a37c4: Merge "Fix doze jank by removing a fullscreen layer of overdraw"...	Jorim Jaggi	2014-11-13	4	-192/+315
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	Fix doze jank by removing a fullscreen layer of overdraw	Jorim Jaggi	2014-11-13	4	-192/+315
* \| \| \| \| \| \|	am 76c234c8: am d0d23c80: Merge "Fix wrong states when waking up from doze vi...	Jorim Jaggi	2014-11-13	1	-0/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am d0d23c80: Merge "Fix wrong states when waking up from doze via touch" into...	Jorim Jaggi	2014-11-13	1	-0/+1
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	Fix wrong states when waking up from doze via touch	Jorim Jaggi	2014-11-13	1	-0/+1
\| \| \|/ / / /
\| \| * \| \| \|	Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev	Geoff Mendal	2014-11-13	22	-409/+249
\| \| \|\ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| \| * \| \|	Import translations. DO NOT MERGE	Geoff Mendal	2014-11-12	29	-522/+306
\| \| \| \| \|/ \| \| \| \|/\|
\| \| * \| \|	Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev	Geoff Mendal	2014-11-12	8	-113/+57
\| \| \|\ \ \
\| \| \| * \| \|	Import translations. DO NOT MERGE	Geoff Mendal	2014-11-12	8	-113/+57
\| \| \| \|/ /
\| * \| \| \|	Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev	Geoff Mendal	2014-11-13	17	-247/+127
\| \|\ \ \ \
\| \| * \| \| \|	Import translations. DO NOT MERGE	Geoff Mendal	2014-11-12	24	-360/+184
\| * \| \| \| \|	Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev	Geoff Mendal	2014-11-12	8	-113/+57
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Import translations. DO NOT MERGE	Geoff Mendal	2014-11-12	8	-113/+57
\| \| \|/ / / /
* \| \| \| \| \|	resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp	Dan Albert	2014-11-12	1	-2/+0
\|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| * \| \| \| \|	Move frameworks/base over to libc++.	Dan Albert	2014-11-12	1	-2/+0
\| * \| \| \| \|	Merge "Import translations. DO NOT MERGE" into stage-aosp-master	Baligh Uddin	2014-10-31	2	-2/+2
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-10-30	2	-2/+2
\| * \| \| \| \| \|	Merge "Import translations. DO NOT MERGE" into stage-aosp-master	Baligh Uddin	2014-10-31	72	-14/+587
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-10-30	72	-14/+587
\| \| \|/ / / / /
\| * \| \| \| \| \|	Merge "Import translations. DO NOT MERGE" into stage-aosp-master	Baligh Uddin	2014-10-31	8	-12/+12
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-10-30	8	-12/+12
\| \| \|/ / / / /
\| * \| \| \| \| \|	Merge "Import translations. DO NOT MERGE" into stage-aosp-master	Baligh Uddin	2014-10-31	72	-298/+298
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-10-30	72	-298/+298
\| \| \|/ / / / /
\| * \| \| \| \| \|	Merge "Import translations. DO NOT MERGE" into stage-aosp-master	Baligh Uddin	2014-10-31	72	-230/+446
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-10-30	72	-230/+446
\| \| \|/ / / / /
\| * \| \| \| \| \|	Merge "Import translations. DO NOT MERGE" into stage-aosp-master	Baligh Uddin	2014-10-31	2	-3/+3
\| \|\ \ \ \ \ \