frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2	Bruno Oliveira	2011-06-21	2	-0/+10
\|\
\| *	Integrating RandomMusicPlayer sample into tree.	Bruno Oliveira	2011-06-07	2	-0/+10
* \|	docs: fix a couple typos	Scott Main	2011-06-20	2	-2/+2
* \|	docs: fix broken link	Scott Main	2011-06-20	1	-1/+1
* \|	Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90...	Robert Ly	2011-06-20	1	-6/+16
\|\ \
\| * \|	cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7	Robert Ly	2011-06-16	1	-6/+16
* \| \|	Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb...	Robert Ly	2011-06-20	1	-1/+2
\|\ \ \
\| * \| \|	cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb	Robert Ly	2011-06-16	1	-1/+2
\| \|/ /
* \| \|	SDK only: integrate new sample code, deprecating along the way.	Dianne Hackborn	2011-06-16	1	-0/+20
\|/ /
* \|	Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d7...	Robert Ly	2011-06-14	1	-9/+9
\|\ \
\| * \|	cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d	Robert Ly	2011-06-14	1	-9/+9
* \| \|	Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e4...	Robert Ly	2011-06-14	1	-35/+35
\|\ \ \
\| * \| \|	cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc	Robert Ly	2011-06-09	1	-35/+35
\| \|/ /
* \| \|	Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d...	Robert Ly	2011-06-14	2	-3/+86
\|\ \ \
\| * \| \|	cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac	Robert Ly	2011-06-14	2	-3/+86
\| \|/ /
* \| \|	Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b859...	Robert Ly	2011-06-14	1	-20/+3
\|\ \ \
\| * \| \|	Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf9...	Robert Ly	2011-06-14	1	-20/+3
* \| \| \|	Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34b...	Robert Ly	2011-06-14	1	-2/+1
\|\ \ \ \
\| * \| \| \|	Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4e...	Robert Ly	2011-06-14	1	-2/+1
* \| \| \| \|	Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b045381...	Robert Ly	2011-06-14	6	-719/+1324
\|\ \ \ \ \
\| * \| \| \| \|	cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a	Robert Ly	2011-06-14	6	-719/+1324
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49...	Robert Ly	2011-06-14	2	-129/+347
\|\ \ \ \ \
\| * \| \| \| \|	cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e	Robert Ly	2011-06-09	2	-129/+347
\| \|/ / / /
* \| \| \| \|	Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb...	Robert Ly	2011-06-14	1	-1/+2
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| / / \| \|_\|/ / \|/\| \| \|
\| * \| \|	cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb	Robert Ly	2011-06-14	1	-1/+2
\| \|/ /
* \| \|	cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7	Robert Ly	2011-06-14	1	-3/+20
* \| \|	Update resources documentation with new qualifiers.	Dianne Hackborn	2011-06-13	1	-40/+80
\|/ /
* \|	Add old blog posts as articles, batch 1	Roman Nurik	2011-06-03	7	-1/+314
* \|	Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: ...	Scott Main	2011-06-02	2	-13/+42
\|\ \
\| * \|	cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e	Scott Main	2011-06-02	2	-13/+42
* \| \|	Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs:...	Scott Main	2011-06-02	2	-6/+139
\|\ \ \
\| * \| \|	cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514	Scott Main	2011-06-02	2	-6/+139
\| \|/ /
* \| \|	Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs:...	Scott Main	2011-06-02	1	-2/+2
\|\ \ \
\| * \| \|	Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b	Scott Main	2011-06-02	1	-2/+2
\| \|/ /
* \| \|	doc typo	Scott Main	2011-06-01	1	-1/+1
\|/ /
* \|	docs: fix typos	Scott Main	2011-06-01	1	-4/+4
* \|	Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f	Joe Malin	2011-05-31	1	-1/+20
\|/
*	Merge "docs: adjust what's visible for online and offline docs" into honeycom...	Scott Main	2011-05-27	2	-9/+18
\|\
\| *	docs: adjust what's visible for online and offline docs	Scott Main	2011-05-27	2	-9/+18
* \|	cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2	Scott Main	2011-05-26	1	-39/+3
\|/
*	cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5	Scott Main	2011-05-26	1	-2/+4
*	cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262	Scott Main	2011-05-26	3	-9/+242
*	Swap Mifare for MIFARE.	Jeff Hamilton	2011-05-25	1	-2/+2
*	am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b6...	Joe Fernandez	2011-05-19	3	-5/+15
\|\
\| *	Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f...	Joe Fernandez	2011-05-19	3	-5/+15
\| \|\
\| \| *	docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81...	Joe Fernandez	2011-05-17	3	-5/+15
* \| \|	am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003...	Katie McCormick	2011-05-17	3	-162/+964
\|\ \ \ \| \|/ /
\| * \|	Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34...	Katie McCormick	2011-05-17	3	-162/+964
\| \|/
* \|	am dcf2f354: docs: simple update to OpenGl doc to update version support Note...	Scott Main	2011-05-17	1	-17/+17
\|\ \ \| \|/
\| *	docs: simple update to OpenGl doc to update version support	Scott Main	2011-05-17	1	-17/+17