frameworks_base.git - frameworks/base

	Commit message (Collapse)	Author	Age	Files	Lines
*	am 7dfcae9b: am d8694667: am ae6bdf63: Merge "Add Colemak keyboard layout"	Jean-Baptiste Queru	2013-07-08	3	-0/+337
\|\ \| \| \| \| \| \| \| \|	* commit '7dfcae9bae9fc16226b1a0496e947be5cedd1773': Add Colemak keyboard layout
\| *	am d8694667: am ae6bdf63: Merge "Add Colemak keyboard layout"	Jean-Baptiste Queru	2013-07-08	3	-0/+337
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'd8694667da7561301371cc2c125104076c75608b': Add Colemak keyboard layout
\| \| *	am ae6bdf63: Merge "Add Colemak keyboard layout"	Jean-Baptiste Queru	2013-07-08	3	-0/+337
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'ae6bdf63f532d136d61d0b7dec9117bfa2d37773': Add Colemak keyboard layout
\| \| \| *	Merge "Add Colemak keyboard layout"	Jean-Baptiste Queru	2013-07-08	3	-0/+337
\| \| \| \|\
\| \| \| \| *	Add Colemak keyboard layout	Christopher Eby	2013-07-08	3	-0/+337
\| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I203b92e56522bc7b3014195d5d83dc1fdb3cab15
* \| \| \|	Merge "KeySetManager: change KEYSET_NOT_FOUND to public"	Kenny Root	2013-07-08	1	-1/+4
\|\ \ \ \
\| * \| \| \|	KeySetManager: change KEYSET_NOT_FOUND to public	Kenny Root	2013-07-08	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the constant KEYSET_NOT_FOUND so that other source code components can use that as the sentinel value directly instead of -1 Change-Id: If89de5fb312d55e360b96aadbc6effcd480043b2
* \| \| \| \|	Merge "KeySetManager: fix indentation"	Kenny Root	2013-07-08	1	-1/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	KeySetManager: fix indentation	Kenny Root	2013-07-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I4fe67143bce30a7592c6a0f5a094172112bdfe43
* \| \| \| \|	am db550fc9: am 0e545bf5: am 9775203b: Merge "SectionIndexer: Update Javadoc ↵	Jean-Baptiste Queru	2013-07-08	1	-1/+3
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for ExpandableListAdapters" * commit 'db550fc900eaf3a5a845dcd0c0bb0ead2b1582d6': SectionIndexer: Update Javadoc for ExpandableListAdapters
\| * \| \| \|	am 0e545bf5: am 9775203b: Merge "SectionIndexer: Update Javadoc for ↵	Jean-Baptiste Queru	2013-07-08	1	-1/+3
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ExpandableListAdapters" * commit '0e545bf5502fde4fe2c96377829bd4c3f7c2d727': SectionIndexer: Update Javadoc for ExpandableListAdapters
\| \| * \| \|	am 9775203b: Merge "SectionIndexer: Update Javadoc for ExpandableListAdapters"	Jean-Baptiste Queru	2013-07-08	1	-1/+3
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \|	* commit '9775203b610267bf8cecaf7c00db68b73b529ced': SectionIndexer: Update Javadoc for ExpandableListAdapters
\| \| \| * \|	Merge "SectionIndexer: Update Javadoc for ExpandableListAdapters"	Jean-Baptiste Queru	2013-07-08	1	-1/+3
\| \| \| \|\ \
\| \| \| \| * \|	SectionIndexer: Update Javadoc for ExpandableListAdapters	Vairavan Srinivasan	2013-03-04	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SectionIndexer could be implemented by ExpandableListAdapters that considers groups and sections as synonymous and such adapters have to account for collapsed groups and should return appropriate section/position. Change-Id: If0dec268da8fa30bd26f4d0aaad7e644a9944313
* \| \| \| \| \|	am 58d52298: am 57512008: am 8f793103: Merge "Set foreground priority for ↵	Jean-Baptiste Queru	2013-07-08	1	-1/+3
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	shutdown receivers." * commit '58d52298bebe21c4fb79ec8fc5e1c76a7503e0a5': Set foreground priority for shutdown receivers.
\| * \| \| \| \|	am 57512008: am 8f793103: Merge "Set foreground priority for shutdown ↵	Jean-Baptiste Queru	2013-07-08	1	-1/+3
\| \|\ \ \ \ \ \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	receivers." * commit '57512008e2f9f1f04ff5a11b522533c753ed36fe': Set foreground priority for shutdown receivers.
\| \| * \| \| \|	am 8f793103: Merge "Set foreground priority for shutdown receivers."	Jean-Baptiste Queru	2013-07-08	1	-1/+3
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '8f793103d81e988e2ef25ecdfde1b279e299a97e': Set foreground priority for shutdown receivers.
\| \| \| * \| \|	Merge "Set foreground priority for shutdown receivers."	Jean-Baptiste Queru	2013-07-08	1	-1/+3
\| \| \| \|\ \ \
\| \| \| \| * \| \|	Set foreground priority for shutdown receivers.	Martin Wallgren	2013-02-04	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The broadcast of ACTION_SHUTDOWN has a timeout of 10 seconds. To reduce the risk of hitting the timeout and speeding up the shutdown sequence in ShutdownThread we set the priority of the BroadcastReceivers to FLAG_RECEIVER_FOREGROUND. We have seen that this change reduces the shutdown time when the system is under heavy load. Change-Id: I22cbf6af8cf6fc4bdefaa1c3da8a7eed7e7b7674
* \| \| \| \| \| \|	Merge "Use global references for Bitmap AndroidPixelRefs"	Chris Craik	2013-07-08	4	-29/+53
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Use global references for Bitmap AndroidPixelRefs	Chris Craik	2013-07-08	4	-29/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bug:9621717 Because we're no longer holding onto Bitmaps Java side during DisplayList lifetime, use global refs to keep the backing byte arrays around. Adds back bitmap buffer passing + native ref management removed by 3b748a44c6bd2ea05fe16839caf73dbe50bd7ae9 Adds back globalRef-ing removed by f890fab5a6715548e520a6f010a3bfe7607ce56e Change-Id: Ia59ba42f05bea6165aec2b800619221a8083d580
* \| \| \| \| \| \| \|	Merge "Move mLaunchingActivity from stack to supervisor."	Craig Mautner	2013-07-08	3	-125/+108
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Move mLaunchingActivity from stack to supervisor.	Craig Mautner	2013-07-05	3	-125/+108
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There did not need to be one launching wakelock for each stack. Moving it to the stack supervisor makes the logic much simpler and fixes bug 9693439. Change-Id: I5c9ae856540170a4d66fedb74becb6959c44dd8f
* \| \| \| \| \| \| \| \|	am a998fa2d: am e14afe71: am 58f26e9d: Merge "The order of child windows is ↵	Jean-Baptiste Queru	2013-07-08	1	-1/+26
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	switched" * commit 'a998fa2df957ad3f1c860d5ab8903041cf53a2f0': The order of child windows is switched
\| * \| \| \| \| \| \| \|	am e14afe71: am 58f26e9d: Merge "The order of child windows is switched"	Jean-Baptiste Queru	2013-07-08	1	-1/+26
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'e14afe7163a9d25c4d06e40165051f5c2d4d540a': The order of child windows is switched
\| \| * \| \| \| \| \| \|	am 58f26e9d: Merge "The order of child windows is switched"	Jean-Baptiste Queru	2013-07-08	1	-1/+26
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|_\|/ / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '58f26e9dfbd3986037fa5e52e8def1cb6b741bc3': The order of child windows is switched
\| \| \| * \| \| \| \| \|	Merge "The order of child windows is switched"	Jean-Baptiste Queru	2013-07-08	1	-1/+26
\| \| \| \|\ \ \ \ \ \
\| \| \| \| * \| \| \| \| \|	The order of child windows is switched	takeda.masayuki	2013-07-08	1	-1/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By calling WindowManagerService#reAddWindowLocked(), the window object in DisplayContent.mWindows is rearranged. If this window has children, the window objects belonging to WindowState.mChildWindows are also rearranged together. At this time, while DisplayContent.mWindows is arranged in ascending order of Z-Order, WindowState.mChildWindows is arranged in descending order. Therefore, if children (= WindowState.mChildWindows) are added to DisplayContent.mWindows in the original order, the order of children is switched. I think that children must be sorted before they are added. Change-Id: I28a506f17fcd99c801a3faa17cca66fffb291596
* \| \| \| \| \| \| \| \| \|	am 4e4cb74f: am c5825c83: am 0f4ef70c: am 637c15df: am 98dc0c44: am ↵	Scott Main	2013-07-08	1	-23/+18
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	31da6322: dashboard update for 7/8 * commit '4e4cb74f2e8ee3c45fec4283f020d1f727832dac': dashboard update for 7/8
\| * \| \| \| \| \| \| \| \|	am c5825c83: am 0f4ef70c: am 637c15df: am 98dc0c44: am 31da6322: dashboard ↵	Scott Main	2013-07-08	1	-23/+18
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update for 7/8 * commit 'c5825c834faa5edefc2c9b430932b83f1c9145e7': dashboard update for 7/8
\| \| * \ \ \ \ \ \ \ \	am 0f4ef70c: am 637c15df: am 98dc0c44: am 31da6322: dashboard update for 7/8	Scott Main	2013-07-08	1	-23/+18
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '0f4ef70c05c1e24b6a014eb30f22aef74b38a9ee': dashboard update for 7/8
\| \| \| * \ \ \ \ \ \ \ \	am 637c15df: am 98dc0c44: am 31da6322: dashboard update for 7/8	Scott Main	2013-07-08	1	-23/+18
\| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '637c15dfffd3a75998f7dbf2061b249d026b9eb1': dashboard update for 7/8
\| \| \| \| * \ \ \ \ \ \ \ \	am 98dc0c44: am 31da6322: dashboard update for 7/8	Scott Main	2013-07-08	1	-23/+18
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '98dc0c447fe2f71dbac16343a63203052e99cee1': dashboard update for 7/8
\| \| \| \| \| * \ \ \ \ \ \ \ \	am 31da6322: dashboard update for 7/8	Scott Main	2013-07-08	1	-23/+18
\| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '31da63220f1038b65d094bf510cd22f6a6da9769': dashboard update for 7/8
\| \| \| \| \| \| * \| \| \| \| \| \| \| \|	dashboard update for 7/8	Scott Main	2013-07-08	1	-23/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I4935d5544754bbbd1ceb3d535ad5cb9a5dbe2453
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 869699cd: am 22818680: am a4854d39: (-s ours) Merge "Mixed delete/delete[]."	Jean-Baptiste Queru	2013-07-08	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '869699cd6e8375cc94115b507f9449efb3a5bc16': Mixed delete/delete[].
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	am 22818680: am a4854d39: (-s ours) Merge "Mixed delete/delete[]."	Jean-Baptiste Queru	2013-07-08	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '228186809a25a870c10ed1c8e77ff9623127d304': Mixed delete/delete[].
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	am a4854d39: (-s ours) Merge "Mixed delete/delete[]."	Jean-Baptiste Queru	2013-07-08	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|/ / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'a4854d39ae6e03d6b9430bfdef85ecb7505e0139': Mixed delete/delete[].
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge "Mixed delete/delete[]."	Jean-Baptiste Queru	2013-07-08	1	-2/+2
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|/ / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \| \| \| \|	Mixed delete/delete[].	msg555	2013-07-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Error found via valgrind.
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix build.	Ying Wang	2013-07-08	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I2348e75e95581b1e5acf1c52b83948e46547a19e
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 693f59a3: am b62bdd86: am 61754145: am 07797c45: am 5c27ec22: am ↵	Joe Malin	2013-07-08	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	c7d3d28b: am 8b3c7d0c: am c355a1c1: DOC: Sync Adapters Android Training * commit '693f59a373c7976f53a0941ba7307dbbae72b357': DOC: Sync Adapters Android Training
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	am b62bdd86: am 61754145: am 07797c45: am 5c27ec22: am c7d3d28b: am ↵	Joe Malin	2013-07-08	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	8b3c7d0c: am c355a1c1: DOC: Sync Adapters Android Training * commit 'b62bdd862f8c6be5879a10400c8156057324469c': DOC: Sync Adapters Android Training
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	am 61754145: am 07797c45: am 5c27ec22: am c7d3d28b: am 8b3c7d0c: am ↵	Joe Malin	2013-07-08	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|/ / / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	c355a1c1: DOC: Sync Adapters Android Training * commit '61754145f4a6e897963ebbb73157b5ee039ec247': DOC: Sync Adapters Android Training
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	am 07797c45: am 5c27ec22: am c7d3d28b: am 8b3c7d0c: am c355a1c1: DOC: Sync ↵	Joe Malin	2013-07-08	0	-0/+0
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \|_\|_\|/ / / / / / / / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adapters Android Training * commit '07797c45dea5bcdf4c21ee7a30e02af98a2d8ed8': DOC: Sync Adapters Android Training
\| \| \| \| * \| \| \| \| \| \| \| \| \| \|	am 5c27ec22: am c7d3d28b: am 8b3c7d0c: am c355a1c1: DOC: Sync Adapters ↵	Joe Malin	2013-07-08	7	-0/+1841
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \|_\|_\|/ / / / / / / \| \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Android Training * commit '5c27ec22133cbea536283c971857759e9e7188ba': DOC: Sync Adapters Android Training
\| \| \| \| \| * \| \| \| \| \| \| \| \| \|	am c7d3d28b: am 8b3c7d0c: am c355a1c1: DOC: Sync Adapters Android Training	Joe Malin	2013-07-08	7	-0/+1841
\| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \|_\|_\|/ / / / / / \| \| \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'c7d3d28b67ee038e6cb2b7a7ad80ea4a8fd3acdd': DOC: Sync Adapters Android Training
\| \| \| \| \| \| * \| \| \| \| \| \| \| \|	am 8b3c7d0c: am c355a1c1: DOC: Sync Adapters Android Training	Joe Malin	2013-07-08	7	-0/+1841
\| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '8b3c7d0c8fec82a6ad32abcb7e78416d8513512d': DOC: Sync Adapters Android Training
\| \| \| \| \| \| \| * \ \ \ \ \ \ \ \	am c355a1c1: DOC: Sync Adapters Android Training	Joe Malin	2013-07-08	7	-0/+1841
\| \| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'c355a1c156ef549f97e3dc6611ab2a9c484889c5': DOC: Sync Adapters Android Training
\| \| \| \| \| \| \| \| * \| \| \| \| \| \| \| \|	DOC: Sync Adapters Android Training	Joe Malin	2013-06-30	7	-0/+1841
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ia857483e1e530436d3c0b1c99697bd52eaa37903 (cherry picked from commit e9df511e2018eb6a296408d09e355c6f2c77ae59)