frameworks_base.git - frameworks/base

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge "Fix visitFieldInsn in layoutlib_create."	Deepanshu Gupta	2014-04-01	6	-7/+36
\|\
\| *	Fix visitFieldInsn in layoutlib_create.	Deepanshu Gupta	2014-03-31	6	-7/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	The bug caused some classes to be missed when computing the dependencies of the existing classes. Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
* \|	Merge "Clean up two wifi javadoc comments"	Brian Williammee	2014-04-01	2	-5/+3
\|\ \
\| * \|	Clean up two wifi javadoc comments	Brian Williammee	2014-03-31	2	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove references to TI drivers, and unnecessary uncertainty. Change-Id: I74a01357264338df7c513684c6c752d1edb4ea4d
* \| \|	am a3e6f36f: (-s ours) am 8c3d3e82: (-s ours) am 53b3d44f: (-s ours) am ↵	Baligh Uddin	2014-04-01	0	-0/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dc5e02bd: (-s ours) Import translations. DO NOT MERGE * commit 'a3e6f36f406f9e65dee1a404fc80b6cc96088776': Import translations. DO NOT MERGE
\| * \ \	am 8c3d3e82: (-s ours) am 53b3d44f: (-s ours) am dc5e02bd: (-s ours) Import ↵	Baligh Uddin	2014-04-01	0	-0/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	translations. DO NOT MERGE * commit '8c3d3e826932da75f5399baaf5bcbc3b1f3a9372': Import translations. DO NOT MERGE
\| \| * \ \	am 53b3d44f: (-s ours) am dc5e02bd: (-s ours) Import translations. DO NOT MERGE	Baligh Uddin	2014-04-01	0	-0/+0
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '53b3d44f524c162a18ca91034c90ac9f7e62e561': Import translations. DO NOT MERGE
\| \| \| * \ \	am dc5e02bd: (-s ours) Import translations. DO NOT MERGE	Baligh Uddin	2014-04-01	0	-0/+0
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'dc5e02bdccbbc60ede21ae706f06c696b6983812': Import translations. DO NOT MERGE
\| \| \| \| * \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-03-31	2	-19/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I2cd18ee1d77495f7294bdb4e836def0bb394d8f4 Auto-generated-cl: translation import
* \| \| \| \| \| \|	am fb19fc61: am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix.	Katie McCormick	2014-04-01	1	-2/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'fb19fc61f28bcff1b129d1a60913f5b8722f10cf': Doc Update: revert PendingIntent fix.
\| * \| \| \| \| \|	am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix.	Katie McCormick	2014-04-01	1	-2/+2
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '905a5b1477b3a1899ef389dbe081f9c70a4fe13d': Doc Update: revert PendingIntent fix.
\| \| * \| \| \| \|	am 87d9d1a0: Doc Update: revert PendingIntent fix.	Katie McCormick	2014-04-01	1	-2/+2
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '87d9d1a0405e6cdbcd7c87cfebee04b622100753': Doc Update: revert PendingIntent fix.
\| \| \| * \| \| \|	Doc Update: revert PendingIntent fix.	Katie McCormick	2014-03-31	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Original fix was in error. Reverting. See: b/10641568 Change-Id: I471157388b2d55aa99bd16813c07607b8a0a7046
* \| \| \| \| \| \|	Merge "Fix bug #13727850 Input values are not visible when setting up the ↵	Fabrice Di Meglio	2014-04-01	2	-1/+14
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	lockscreen... ...security(PIN/Passwor/Pattern)."
\| * \| \| \| \| \| \|	Fix bug #13727850 Input values are not visible when setting up the lockscreen...	Fabrice Di Meglio	2014-03-31	2	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	...security(PIN/Passwor/Pattern). - remove that hardcoded color - enable passing a color for the Path lines Change-Id: Ie40b15bf209f41ea2df16842a3e56ffc2020df65
* \| \| \| \| \| \| \|	Camera2: Fix missing capture result callback issue	Zhijun He	2014-03-31	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When configuring output right after submitting some capture request, the waitUntilIdle clears the capture mCaptureListenerMap and mRepeatingRequestIdDeletedList. This caused the listener is cleared before the capture result is delivered to application side. Since the listener is already removed properly, it is really not needed to clear them right after idling the device. It also doesn't make sense to add the repeating request id that has no listener hooked up to the mRepeatingRequestIdDeletedList, this caused out of sync between id deleted list and the mCaptureListenerMap for repeating request. Bug: 13730119 Change-Id: I94ab7a5515f841ffd97b103c2c1b71d92afd955a
* \| \| \| \| \| \| \|	am c796ccaa: am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL ↵	Jason Sams	2014-04-01	1	-1/+5
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	setSurfaceTexture problem" * commit 'c796ccaafb935592b98d5aaad2594791935f6530': Fix RenderScriptGL setSurfaceTexture problem
\| * \| \| \| \| \| \|	am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"	Jason Sams	2014-04-01	1	-1/+5
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '095ece10095ecb8c76e3ed4fb0dd1e23a5ced22b': Fix RenderScriptGL setSurfaceTexture problem
\| \| * \ \ \ \ \ \	am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"	Jason Sams	2014-04-01	1	-1/+5
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'b3cafa56205942343930e4fbb0a3d50d6e33a046': Fix RenderScriptGL setSurfaceTexture problem
\| \| \| * \ \ \ \ \ \	Merge "Fix RenderScriptGL setSurfaceTexture problem"	Jason Sams	2014-03-31	1	-1/+5
\| \| \| \|\ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \|	Fix RenderScriptGL setSurfaceTexture problem	Xiaofei Wan	2014-03-31	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rsnContextSetSurfaceTexture() has no implementation in rs-jni, use nContextSetSurface() in setSurfaceTexture(). Change-Id: I066432575c9e74f21ea3a3776628b572b6e31377 Signed-off-by: Xiaofei Wan <xiaofei.wan@intel.com>
* \| \| \| \| \| \| \| \| \| \|	am 7471a3b1: am adcb288e: am b1088bfe: Merge "update common intents guide to ↵	Scott Main	2014-04-01	1	-6/+305
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add calendar and alarms." into klp-docs * commit '7471a3b1ea3b722168ed3e932d4015750c913c0b': update common intents guide to add calendar and alarms.
\| * \| \| \| \| \| \| \| \| \|	am adcb288e: am b1088bfe: Merge "update common intents guide to add calendar ↵	Scott Main	2014-04-01	1	-6/+305
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and alarms." into klp-docs * commit 'adcb288e3890381c9961ee32a79df8e9d805a6ad': update common intents guide to add calendar and alarms.
\| \| * \| \| \| \| \| \| \| \|	am b1088bfe: Merge "update common intents guide to add calendar and alarms." ↵	Scott Main	2014-04-01	1	-6/+305
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into klp-docs * commit 'b1088bfe8d321f299d92736102b573963315dc26': update common intents guide to add calendar and alarms.
\| \| \| * \| \| \| \| \| \| \|	Merge "update common intents guide to add calendar and alarms." into klp-docs	Scott Main	2014-03-31	1	-6/+305
\| \| \| \|\ \ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \|	update common intents guide to add calendar and alarms.	Scott Main	2014-01-17	1	-6/+305
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I515c6c982104f37b04ef0eddfd0ba8a99e619077
* \| \| \| \| \| \| \| \| \| \| \|	am ce0854cc: (-s ours) am ee800b04: (-s ours) Merge "Import translations. DO ↵	Baligh Uddin	2014-04-01	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| / / \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	NOT MERGE" into klp-modular-dev * commit 'ce0854ccba6adae15cd0b1042e3ad5fb777293da': Import translations. DO NOT MERGE
\| * \| \| \| \| \| \| \| \| \|	am ee800b04: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵	Baligh Uddin	2014-04-01	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	klp-modular-dev * commit 'ee800b04d9ed625db93b1531eec0595838228e2f': Import translations. DO NOT MERGE
\| \| * \| \| \| \| \| \| \| \|	Merge "Import translations. DO NOT MERGE" into klp-modular-dev	Baligh Uddin	2014-03-31	2	-19/+19
\| \| \|\ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-03-31	2	-19/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Iaac2af2440931132501062c4eab4ab609fea8857 Auto-generated-cl: translation import
* \| \| \| \| \| \| \| \| \| \| \|	Fix docs even more	Alan Viverette	2014-03-31	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I436615302d24f2f098e2224881c65dbef0d20cfa
* \| \| \| \| \| \| \| \| \| \| \|	Merge "Fix docs"	Alan Viverette	2014-03-31	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix docs	Alan Viverette	2014-03-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I79ee1cccb723f7471b175e1f2fc7ac94d54a526e
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Add missing dependency in layoutlib build file"	Deepanshu Gupta	2014-03-31	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add missing dependency in layoutlib build file	Deepanshu Gupta	2014-03-31	1	-0/+1
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing dependency on built_ext_data Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge "AudioTrack and AudioRecord JNI cleanup"	Glenn Kasten	2014-03-31	2	-11/+11
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	AudioTrack and AudioRecord JNI cleanup	Glenn Kasten	2014-03-28	2	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename nbChannels to our conventional channelCount, which should make code searches easier. Change-Id: I3c2791db302558a15bc8be198b6f3d482e0e0055
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Switch device default theme over to Quantum"	Alan Viverette	2014-03-31	4	-757/+320
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Switch device default theme over to Quantum	Alan Viverette	2014-03-31	4	-757/+320
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I4d8ad0a9d62b898ae34900b4a749e75a975af5af
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Import translations. DO NOT MERGE"	Baligh Uddin	2014-03-31	2	-19/+19
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-03-31	2	-19/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I81bf08f36ce519a1cc397fc3cbb1d92878df54f1 Auto-generated-cl: translation import
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Import translations. DO NOT MERGE"	Baligh Uddin	2014-03-31	55	-0/+325
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-03-31	55	-0/+325
\| \|/ / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I873e19f2b3e2e27eb1bc555ef8cc3cc09f2de493 Auto-generated-cl: translation import
* \| \| \| \| \| \| \| \| \| \| \| \| \|	am 7d394df2: am ae1b763c: Merge "LE: Add API to configure MTU for a given ↵	Zhihai Xu	2014-03-31	5	-0/+72
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	connection (3/4)" into klp-modular-dev * commit '7d394df2ab8f951215a775df8d2bd9e6518e746a': LE: Add API to configure MTU for a given connection (3/4)
\| * \| \| \| \| \| \| \| \| \| \| \| \|	am ae1b763c: Merge "LE: Add API to configure MTU for a given connection ↵	Zhihai Xu	2014-03-31	5	-0/+72
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(3/4)" into klp-modular-dev * commit 'ae1b763cded7e2cb3eec3cbec0680c25e55c109c': LE: Add API to configure MTU for a given connection (3/4)
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge "LE: Add API to configure MTU for a given connection (3/4)" into ↵	Zhihai Xu	2014-03-31	5	-0/+72
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	klp-modular-dev
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	LE: Add API to configure MTU for a given connection (3/4)	Andre Eisenbach	2014-03-25	5	-0/+72
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bug:13571470 Change-Id: I3619617eaf864701a35f7802bc71805784d768d0
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am ce30fca8: am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux ↵	Nick Kralevich	2014-03-31	2	-9/+21
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	relabel of /data/data occurs." * commit 'ce30fca85deec8e268009a2acaefe85541ab1e58': Change when the SELinux relabel of /data/data occurs.
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel of ↵	Nick Kralevich	2014-03-31	2	-9/+21
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	/data/data occurs." * commit 'e531e2ec6b311c35b077cc228e832b3f1530dffa': Change when the SELinux relabel of /data/data occurs.
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs."	Nick Kralevich	2014-03-31	2	-9/+21
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '3b2a9d22794cb9f1c2a28884b5c3ba92ecc6ff96': Change when the SELinux relabel of /data/data occurs.