android_development - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \|	am 743e1fd6: am 0b3758ea: Adding new samples to browseable section of DAC	Alexander Lucas	2014-02-08	400	-421/+16062
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '743e1fd6ad69e15ad519a77ddb9d7ff00011f39f': Adding new samples to browseable section of DAC
\| \| *	Adding new samples to browseable section of DAC	Alexander Lucas	2014-02-07	400	-421/+16062
\| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I58e10e787f5df668331fc04e97a6c2efcd75f76f
* \| \|	Handle IOException from MediaCodec factory methods	Andy Hung	2014-01-16	1	-1/+2
\|/ / \| \| \| \| \| \| \| \| \| \|	Bug: 1136427 Change-Id: I411a341b551454ee3bd1215e3c6f5572d1555675 Signed-off-by: Andy Hung <hunga@google.com>
* \|	am 3a85c6d5: am 98a13468: Updating samples browser to include ↵	Alexander Lucas	2013-11-22	156	-8/+90
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	ActionBarCompat samples * commit '3a85c6d598f8575a1442278bf3733eec6c5d6a2e': Updating samples browser to include ActionBarCompat samples
\| *	Updating samples browser to include ActionBarCompat samples	Alexander Lucas	2013-11-21	156	-8/+90
\| \| \| \| \| \| \| \|	Change-Id: I4bf39042db2bfef3ed538280f6fc533a7a379882
\| *	Add updated StorageProvider sample, merge _index with existing file.	Dirk Dougherty	2013-11-01	20	-20/+1061
\| \| \| \| \| \| \| \|	Change-Id: I63d691929d2b30cedaafa5ede900670c59d4f83d (cherry picked from commit 99acac3adb85aecf7dc42ae9242adfa8c8c6dfc0)
* \|	resolved conflicts for merge of fae59e8a to klp-dev-plus-aosp	Scott Main	2013-11-05	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \|	Change-Id: Iaf15aa6c9087eb0e72661b40acbf74830df0b00c
\| * \|	resolved conflicts for merge of 1d38e9a1 to klp-ub-dev	Scott Main	2013-11-05	1	-2/+2
\| \|\\| \| \| \| \| \| \| \| \| \|	Change-Id: I4f74db2ae175c2405aacece146244928f436551c
\| \| *	Merge "Updated description for the StorageProvider browseable sample." into ↵	Scott Main	2013-10-31	1	-0/+7
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	klp-docs
\| \| \| *	Updated description for the StorageProvider browseable sample.	quddusc	2013-10-31	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I3f83a89e3b154f207e4054b92f0d4fc1f7851eb4 (cherry picked from commit a76387f7a4f5e65f8225e1b657ecdcfbee20682b)
\| \| * \|	Fixed broken link in ActivityInstrumentation sample description.	quddusc	2013-10-31	1	-1/+1
\| \| \|/ \| \| \| \| \| \| \| \| \|	Change-Id: I1ab9a5750693f44dec7aa97c99a2cfcd6af0b78e (cherry picked from commit b5de8afa234acc3caf231fe319f471dabb7d99b1)
\| * \|	resolved conflicts for merge of 2397b75d to klp-ub-dev	Dirk Dougherty	2013-11-05	1	-2/+2
\| \|\\| \| \| \| \| \| \| \| \| \|	Change-Id: I1807a041af543acb7eb93105712d7f4af4d67521
\| \| *	Fix broken javadoc reference.	Dirk Dougherty	2013-10-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I6b39015c340894715b3b24980ca0241a5e8f2a5a (cherry picked from commit cc1867bc5b13507da9e9142d018f8cee3a5d0f08)
\| \| *	Add StorageProvider sample code to browseables.	Dirk Dougherty	2013-10-31	19	-0/+929
\| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I353f596e9fc7455781e4c8d7f1972dfcd5739ddb (cherry picked from commit c921db8d27232dbe985ea829eb114740a03609bd)
\| * \|	resolved conflicts for merge of 3943cdc9 to klp-ub-dev	quddusc	2013-11-04	2	-4/+4
\| \|\\|
* \| \|	am 99acac3a: Add updated StorageProvider sample, merge _index with existing ↵	Dirk Dougherty	2013-11-04	20	-20/+1061
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	file. * commit '99acac3adb85aecf7dc42ae9242adfa8c8c6dfc0': Add updated StorageProvider sample, merge _index with existing file.
\| * \|	Add updated StorageProvider sample, merge _index with existing file.	Dirk Dougherty	2013-11-01	20	-20/+1061
\| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I63d691929d2b30cedaafa5ede900670c59d4f83d
* \| \|	Merge commit '3943cdc9' into manualmerge2	quddusc	2013-11-01	2	-5/+5
\|\ \ \ \| \|/ / \|/\| / \| \|/ \| \| \| \| \| \| \| \|	Conflicts: samples/browseable/ActivityInstrumentation/_index.jd samples/browseable/TextLinkify/_index.jd Change-Id: Ia9a333bd09d2e7e9417a560581c40bd02d295c12
\| *	Updated browsable sample descriptions.	quddusc	2013-10-30	30	-210/+158
\| \| \| \| \| \| \| \|	Change-Id: I21e3dfacb4bc1acfbe3b17c5f8001ee758f9eec2
* \|	Fixed broken link in ActivityInstrumentation sample description.	quddusc	2013-10-31	1	-1/+1
\| \| \| \| \| \| \| \|	Change-Id: I1ab9a5750693f44dec7aa97c99a2cfcd6af0b78e
* \|	Fix broken javadoc reference.	Dirk Dougherty	2013-10-31	1	-1/+1
\| \| \| \| \| \| \| \|	Change-Id: I6b39015c340894715b3b24980ca0241a5e8f2a5a
* \|	Updated browsable sample descriptions.	quddusc	2013-10-31	30	-210/+158
\| \| \| \| \| \| \| \|	Change-Id: I21e3dfacb4bc1acfbe3b17c5f8001ee758f9eec2 (cherry picked from commit 3943cdc9626911fe2732fedd5c85e920c6078a9f)
* \|	Updated description for the StorageProvider browseable sample.	quddusc	2013-10-30	1	-0/+7
\| \| \| \| \| \| \| \|	Change-Id: I3f83a89e3b154f207e4054b92f0d4fc1f7851eb4
* \|	Add StorageProvider sample code to browseables.	Dirk Dougherty	2013-10-30	19	-0/+929
\|/ \| \| \|	Change-Id: I353f596e9fc7455781e4c8d7f1972dfcd5739ddb
*	Add prebuilt browseable samples as static files.	Dirk Dougherty	2013-10-29	839	-0/+35303
	Change-Id: Ifb5382223343400882834d2dd9c182c3df602e34