frameworks_base.git - frameworks/base

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| \| \| * \|	docs: Added info on noHistory and onActivityResult(). Bug: 13807256	Ricardo Cervera	2014-11-05	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Iae4901a311e76401396f89c552e5b27a49c65c83
* \| \| \| \| \|	am 909f840c: am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to ↵	Joe Fernandez	2015-01-07	1	-14/+14
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	lmp-mr1-dev" into lmp-mr1-dev * commit '909f840cdaf4f172b29c2c56921c4619165c4820': docs: Checklist for TV Apps
\| * \| \| \| \|	resolved conflicts for merge of ea0137ef to lmp-mr1-dev	Scott Rowe	2015-01-06	1	-14/+14
\| \|\ \ \ \ \ \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: If0a38ebe4e72ec6c1a3683fab1302ee0fdfe4214
\| \| * \| \| \|	docs: Checklist for TV Apps	Scott Rowe	2015-01-05	1	-14/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I93b57161b3e519164dab551068411f686d772596
* \| \| \| \| \|	am dfc950b4: am aa7c1f68: am 13d31b0a: am d7d1411a: am e2b44f86: docs: ↵	Scott Rowe	2015-01-06	1	-48/+48
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Making TV Apps Searchable - new training * commit 'dfc950b40d7d24c08dc56ffec5327f8da11960e7': docs: Making TV Apps Searchable - new training
\| * \| \| \| \|	am 13d31b0a: am d7d1411a: am e2b44f86: docs: Making TV Apps Searchable - new ↵	Scott Rowe	2015-01-06	1	-48/+48
\| \|\ \ \ \ \ \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	training * commit '13d31b0a40dd58d61e8a6ad82c1de165792b95e4': docs: Making TV Apps Searchable - new training
\| \| * \| \| \|	docs: Making TV Apps Searchable - new training	Scott Rowe	2014-12-19	1	-48/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I188c14789c9ba36a35d0c2d07b349ac301837a48
\| * \| \| \| \|	docs: Fix typo, use --> user	Nick Chalko	2014-12-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Idfadf09b6c1711f6294e155176a2a713f8a8f616
* \| \| \| \| \|	am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as ↵	Eino-Ville Talvala	2014-12-04	1	-9/+1
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	system features as well"" into lmp-mr1-dev * commit '6e21817b8ef160fae5e7046745cb11ceab06b2d7': Revert "Camera: Add new capability flags as system features as well"
\| * \| \| \| \|	Revert "Camera: Add new capability flags as system features as well"	Eino-Ville Talvala	2014-12-03	1	-9/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 6aee1d2ba52cf7f44c9355f279844b8a937903da. But leaves in some of the improved documentation. Bug: 18281970 Bug: 18573576 Change-Id: I320f2229456ac039bc8f3cd8bc8b4ea6cf0e80eb
* \| \| \| \| \|	am e289082a: am dfa99f63: Merge "Camera: Add new capability flags as system ↵	Eino-Ville Talvala	2014-11-24	1	-1/+25
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	features as well" into lmp-mr1-dev * commit 'e289082a7066a86032190aa100425ce29cd2a4f2': Camera: Add new capability flags as system features as well
\| * \| \| \| \|	Merge "Camera: Add new capability flags as system features as well" into ↵	Eino-Ville Talvala	2014-11-22	1	-1/+25
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \|	lmp-mr1-dev
\| \| * \| \| \|	Camera: Add new capability flags as system features as well	Eino-Ville Talvala	2014-11-20	1	-1/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also add all the L and L MR1 new system features to the uses-feature documentation. Bug: 18281970 Change-Id: I116ca3fd04cd90eb53cc696b6fa62488687e7740
* \| \| \| \| \|	am 9e9d1cd3: am a505d0be: am 63108ee3: am 02cb1fe6: am 14f78ed7: Merge ↵	Scott Rowe	2014-11-24	1	-0/+44
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs * commit '9e9d1cd3ff536e8c9d00469f01b00b94fe73e0a2': docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
\| * \| \| \| \|	Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table ↵	Scott Rowe	2014-11-21	1	-0/+44
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs
\| \| * \| \| \| \|	docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21	Scott Rowe	2014-11-07	1	-0/+44
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
\| * \| \| \| \|	Fix and be more explicit about plurals best practices.	Elliott Hughes	2014-11-19	1	-4/+12
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The "one" case should always include %d. Say so, and fix our examples. Also make it clear that developers should always provide exactly "one" and "other". Bug: 18429565 (cherry picked from commit 1fe7d496db1ddc73289e6aae11f4dd4a970141d5) Change-Id: I89656c74b7dfd91584e1bb6d0a3f2da1dda81079
* \| \| \| \|	am ec2d8d0b: am ea8ff822: Merge "Fix and be more explicit about plurals best ↵	Elliott Hughes	2014-11-20	1	-4/+12
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	practices." * commit 'ec2d8d0bb8a36355b8d687c660b5c64e4aebd9b8': Fix and be more explicit about plurals best practices.
\| * \| \| \|	Fix and be more explicit about plurals best practices.	Elliott Hughes	2014-11-19	1	-4/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The "one" case should always include %d. Say so, and fix our examples. Also make it clear that developers should always provide exactly "one" and "other". Bug: 18429565 Change-Id: I09eb39ea6986850c3af28cca3052d319e3c97705
\| * \| \| \|	am 22fa76da: Merge "Doc change: Add Lollipop to platform versions table." ↵	Dirk Dougherty	2014-10-17	1	-0/+11
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into lmp-dev * commit '22fa76dac8de6cfd9e7bc1eb8800f4cddbfc0640': Doc change: Add Lollipop to platform versions table.
\| * \ \ \ \	docs: Notifications changes for L	Scott Rowe	2014-10-17	1	-208/+173
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	automerge: dd88668 * commit 'dd88668392839509c812a544b1132185b3825b69': docs: Notifications changes for L
\| * \ \ \ \ \	Merge "docs: Recents screen for tasks and activities" into lmp-dev	Joe Fernandez	2014-10-17	1	-9/+92
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	automerge: 321e764 * commit '321e7645c305dbc4f7444d364c879bad8946da2b': docs: Recents screen for tasks and activities
\| * \ \ \ \ \ \	Merge "Android 5.0 changes to IME switching" into lmp-dev	Joe Fernandez	2014-10-17	1	-185/+333
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	automerge: d664dc9 * commit 'd664dc93f47e32df865384718055b200585e0e88': Android 5.0 changes to IME switching
\| * \ \ \ \ \ \ \	am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into ↵	David Friedman	2014-10-16	1	-21/+74
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	lmp-dev * commit 'd12e6de645a39e6e902785d544100fb1963aa203': OpenGL 3.1 and AEP documentation for L-release.
\| * \ \ \ \ \ \ \ \	am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev	Nick Kralevich	2014-10-14	1	-25/+31
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '0ae82b05be47df85551a1c759a93e84c8009947c': Docs: adding closing bracket to un-break javadoc tokens.
\| * \ \ \ \ \ \ \ \ \	am d84ce32b: Merge "Fix some documentation typos." into lmp-dev	Newton Allen	2014-10-02	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'd84ce32bd2d7c3cebac15545504f4fec464a6956': Fix some documentation typos.
* \| \ \ \ \ \ \ \ \ \ \	am 1117098b: am d4e3825a: am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 ↵	Scott Rowe	2014-11-03	2	-72/+126
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	isGame, b/18119595 banner" into lmp-docs automerge: aa3be67 * commit 'aa3be670328ee9ff7e1fbd3ec077ff27ddf42013': docs: b/18119632 isGame, b/18119595 banner
\| * \| \| \| \| \| \| \| \| \| \|	docs: b/18119632 isGame, b/18119595 banner	Scott Rowe	2014-10-31	2	-72/+126
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I171b4aff3359ec96b2ea1003870739ad586971c7
* \| \| \| \| \| \| \| \| \| \| \|	am 3be4e43b: am 543a82ed: am 51209aa3: am 43582423: am 0fa6edce: Fixes ↵	David Friedman	2014-10-30	1	-221/+124
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	linebreaks that had gotten altered during the run-up to 5.0 release. * commit '3be4e43b4cb81762c0fae2936b1546e2bb5acdcc': Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
\| * \| \| \| \| \| \| \| \| \| \|	Fixes linebreaks that had gotten altered during the run-up to 5.0 release.	David Friedman	2014-10-28	1	-221/+124
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I7be014d27ef85631b5e26ad2b3ab81d3a12d1813
* \| \| \| \| \| \| \| \| \| \| \|	am a2e6ec07: am 694a9e46: am 0fbbed83: am 60144a7a: am bcf9ced4: am ↵	Natalie Masse	2014-10-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1e5bb861: Link and typo fixed * commit 'a2e6ec070cc9c127a5c376e3bf5e19de09c44324': Link and typo fixed
\| * \| \| \| \| \| \| \| \| \| \|	am bcf9ced4: am 1e5bb861: Link and typo fixed	Natalie Masse	2014-10-24	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| / / \| \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \|	* commit 'bcf9ced47a123220271fcca70f71c2adf69ad100': Link and typo fixed
\| \| * \| \| \| \| \| \| \| \|	Link and typo fixed	Natalie Masse	2014-10-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ie9ace6e002703d7d1f83173da49672cf60ca1653
* \| \| \| \| \| \| \| \| \| \|	am e1fa68cd: am 20a7afd4: am f0c1af8e: am 22fa76da: Merge "Doc change: Add ↵	Dirk Dougherty	2014-10-17	1	-0/+11
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lollipop to platform versions table." into lmp-dev * commit 'e1fa68cd24c5a97a549c101f3eeacb70cafb8c9d': Doc change: Add Lollipop to platform versions table.
\| * \| \| \| \| \| \| \| \| \|	Doc change: Add Lollipop to platform versions table.	Dirk Dougherty	2014-10-17	1	-0/+11
\| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Iad84444396a3b2d24403e88398ca21933741b819
* \| \| \| \| \| \| \| \| \|	am 81584ee6: am 5100b72c: am fafb6c70: am dd886683: docs: Notifications ↵	Scott Rowe	2014-10-17	1	-208/+173
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	changes for L * commit '81584ee6ed1b0378847aaee0ae4091cb9fefe2a3': docs: Notifications changes for L
\| * \| \| \| \| \| \| \| \|	docs: Notifications changes for L	Scott Rowe	2014-10-16	1	-208/+173
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I53c744734358401adefbcffd5ce5a3676d6d955a
* \| \| \| \| \| \| \| \|	am d81ca1da: am 39f69b79: am 770f57e0: am 321e7645: Merge "docs: Recents ↵	Joe Fernandez	2014-10-17	1	-9/+92
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	screen for tasks and activities" into lmp-dev * commit 'd81ca1da0546b4d0d9ff32918132e625e89d4e16': docs: Recents screen for tasks and activities
\| * \| \| \| \| \| \| \|	Merge "docs: Recents screen for tasks and activities" into lmp-dev	Joe Fernandez	2014-10-17	1	-9/+92
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	docs: Recents screen for tasks and activities	Scott Rowe	2014-10-16	1	-9/+92
\| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I94774e60e6a7453a047ad394c3bbfff0cc4dfc7d
* \| \| \| \| \| \| \|	am 315a45e0: am 36d13e6a: am 491fa057: am d664dc93: Merge "Android 5.0 ↵	Joe Fernandez	2014-10-17	1	-185/+333
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	changes to IME switching" into lmp-dev * commit '315a45e085a14884e267c49498e94a316376e212': Android 5.0 changes to IME switching
\| * \| \| \| \| \| \|	Merge "Android 5.0 changes to IME switching" into lmp-dev	Joe Fernandez	2014-10-17	1	-185/+333
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \|	Android 5.0 changes to IME switching	David Friedman	2014-10-16	1	-185/+333
\| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I158736ee36706889a5277f02a652162194289514
* \| \| \| \| \| \|	am 57c63dbf: am b0683f0c: am d12e6de6: Merge "OpenGL 3.1 and AEP ↵	David Friedman	2014-10-16	1	-21/+74
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	documentation for L-release." into lmp-dev automerge: f8e428d * commit '57c63dbf271ebc66c9ce09eaac05b1d1f524944e': OpenGL 3.1 and AEP documentation for L-release.
\| * \| \| \| \| \|	Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev	David Friedman	2014-10-16	1	-21/+74
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
\| \| * \| \| \| \|	OpenGL 3.1 and AEP documentation for L-release.	David Friedman	2014-10-15	1	-21/+74
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I21b75a6f38977729fa8c1c94c66354054bdb780c
* \| \| \| \| \|	am 55bb6a7b: am 01edf579: am fce896fe: am 0ae82b05: resolved conflicts for ↵	Nick Kralevich	2014-10-15	1	-25/+31
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	merge of a4eb81b6 to lmp-dev * commit '55bb6a7b68595ee83b543eda40d191636de1831e': Docs: adding closing bracket to un-break javadoc tokens.
\| * \| \| \| \|	resolved conflicts for merge of a4eb81b6 to lmp-dev	Nick Kralevich	2014-10-14	1	-25/+31
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| / / / \| \| \|/ / /	Change-Id: I73b225141e09826b40e4941140b59d1c163bd9c7
\| \| * \| \|	Docs: adding closing bracket to un-break javadoc tokens.	Eric Gilmore	2014-10-09	1	-25/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug: 17186958 Change-Id: Ib21120d71ccd7c59536af3d26d7090fc919bec17
* \| \| \| \|	am 58f75627: am 94f5155d: am c68aad9f: am d84ce32b: Merge "Fix some ↵	Newton Allen	2014-10-02	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \| \| \| / / \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	documentation typos." into lmp-dev * commit '58f75627d195082e263f6d6d8e3c46c6d0970e63': Fix some documentation typos.