frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
...
\| * \| \| \|	docs: fix broken link	Scott Main	2011-06-20	1	-1/+1
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	am b2dba991: am d1a19b10: am c7c1ba50: Merge "cherrypick from hc-mr1 Change-I...	Robert Ly	2011-06-21	1	-6/+16
\|\ \ \ \ \| \|/ / /
\| * \| \|	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
* \| \| \| \|	am 5520ec6f: am 152e5f56: am 329e0b90: Merge "cherrypick from hc-mr1 Change-I...	Robert Ly	2011-06-21	1	-1/+2
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	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
\| \| \|/ / /
* \| \| \| \|	cherrypick from mr2 Change-Id: I59a34a84075c63715a6b4aaf6d90acead321ea90	Scott Main	2011-06-20	1	-3/+3
* \| \| \| \|	Merge "Fixed MonkeyRunner documentation"	Bill Napier	2011-06-20	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Fixed MonkeyRunner documentation	Michael Wright	2011-06-09	1	-1/+1
* \| \| \| \| \|	resolved conflicts for merge of 872a1e79 to master	Dianne Hackborn	2011-06-16	1	-0/+20
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	SDK only: integrate new sample code, deprecating along the way.	Dianne Hackborn	2011-06-16	1	-0/+20
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	am 2ecb884f: am b481a600: am c7731e07: Merge "cherrypick from hc mr1 Change-I...	Robert Ly	2011-06-14	1	-9/+9
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	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
\| \| \| \|_\|/ \| \| \|/\| \|
* \| \| \| \|	am 8a8f82bb: am 4963cd0b: am 1a3e7cf2: Merge "cherry pick from hc mr1 Change-...	Robert Ly	2011-06-14	1	-35/+35
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	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
\| \| \|/ / /
* \| \| \| \|	am 5e69c0f5: am 1dbb7075: am 8467cd7f: Merge "cherrypick from hc mr1 Change-I...	Robert Ly	2011-06-14	2	-3/+86
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	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
\| \| \|/ / /
* \| \| \| \|	am f3c9a251: am 17cddaf2: am 409b9a4c: Merge "Revert "cherrypick from hc mr1 ...	Robert Ly	2011-06-14	1	-20/+3
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	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
* \| \| \| \| \|	am 2aeafe0b: am b5c31b8a: am 194f4745: Merge "Revert "cherrypick from hc mr1 ...	Robert Ly	2011-06-14	1	-2/+1
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	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
* \| \| \| \| \| \|	resolved conflicts for merge of 398d021b to master	Robert Ly	2011-06-14	6	-719/+1324
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	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
\| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
* \| \| \| \| \| \|	am 0b7d7f53: am b658dfb8: am cbd31aec: Merge "cherry pick from hc mr1 Change-...	Robert Ly	2011-06-14	2	-129/+347
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	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
\| \| \|/ / / / /
* \| \| \| \| \| \|	am ae6dc0c5: am cbfab050: am a91d6552: Merge "cherrypick from hc mr1 Change-I...	Robert Ly	2011-06-14	1	-1/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	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
\| \| \|/ / /
* \| \| \| \|	am ff46480e: am 4cd4c820: am 9fa54704: Merge "cherrypick from hc mr1 Change-I...	Robert Ly	2011-06-14	1	-3/+20
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7	Robert Ly	2011-06-14	1	-3/+20
* \| \| \| \|	am 8a73d211: am 74c48f2b: am 700a1f25: Merge "Update resources documentation ...	Dianne Hackborn	2011-06-14	1	-40/+80
\|\ \ \ \ \ \| \|/ / / / \| \| \| / / \| \|_\|/ / \|/\| \| \|
\| * \| \|	Update resources documentation with new qualifiers.	Dianne Hackborn	2011-06-13	1	-40/+80
\| \|/ /
* \| \|	Merge "Fixed typo. "a a" -> "a""	Frank Sposaro	2011-06-07	1	-1/+1
\|\ \ \
\| * \| \|	Fixed typo. "a a" -> "a"	Frank Sposaro	2011-06-06	1	-1/+1
* \| \| \|	am 16475a3a: am 07613835: am e7d60078: Add old blog posts as articles, batch 1	Roman Nurik	2011-06-03	7	-0/+313
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Add old blog posts as articles, batch 1	Roman Nurik	2011-06-03	7	-1/+314
* \| \| \|	am b9040e77: am 5b8342cf: am a8629089: Merge "cherrypick Change-Id: I7a3612a1...	Scott Main	2011-06-03	2	-13/+42
\|\ \ \ \ \| \|/ / /
\| * \| \|	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
* \| \| \| \|	am 59a3ad16: am d5335253: am b8236751: Merge "cherry pick Change-Id: Id082021...	Scott Main	2011-06-03	2	-6/+139
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	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
\| \| \|/ / /