frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
...
\| * \| \|	Merge "docs: add info about manifest attributes that should not change" into ...	Scott Main	2011-06-22	6	-11/+49
\| \|\ \ \
\| \| * \| \|	docs: add info about manifest attributes that should not change	Scott Main	2011-06-22	6	-11/+49
\| \| \|/ /
* \| \| \|	am d65fab3d: am e2f74aec: am 929cba13: docs: remove exclamation from media title	Scott Main	2011-06-23	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	docs: remove exclamation from media title	Scott Main	2011-06-22	1	-1/+1
* \| \| \|	am 02362299: am a108223f: am d4fac2c0: Doc change: updated TOC for Bluetooth CL.	Katie McCormick	2011-06-23	2	-316/+443
\|\ \ \ \ \| \|/ / /
\| * \| \|	Doc change: updated TOC for Bluetooth CL.	Katie McCormick	2011-06-22	2	-316/+443
* \| \| \|	am dba7dd71: am 6f2bcc4d: am 24ef1aa6: Merge "docs: use new CSE to show resul...	Scott Main	2011-06-23	1	-135/+131
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "docs: use new CSE to show results for all sites" into honeycomb-mr2	Scott Main	2011-06-22	1	-135/+131
\| \|\ \ \
\| \| * \| \|	docs: use new CSE to show results for all sites	Scott Main	2011-06-22	1	-135/+131
* \| \| \| \|	am b6f9e5dd: am 60506b4f: am d60e1b5b: cherrypick from hc-mr1 Change-Id: I755...	Robert Ly	2011-06-23	1	-0/+5
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5	Robert Ly	2011-06-22	1	-0/+5
\| \|/ / /
* \| \| \|	am ecf16143: am 0310f4da: am f5c62362: Merge "Rewriting "Audio and Video" sec...	Bruno Oliveira	2011-06-23	4	-114/+729
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2	Bruno Oliveira	2011-06-21	4	-114/+729
\| \|\ \ \
\| \| * \| \|	Rewriting "Audio and Video" section of Dev Guide.	Bruno Oliveira	2011-06-21	4	-114/+729
* \| \| \| \|	am a62f707d: am f1c71771: am da61eab8: Merge "Integrating RandomMusicPlayer s...	Bruno Oliveira	2011-06-23	2	-0/+10
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	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
* \| \| \| \| \|	am fe8e2fb3: am de937ac0: am bb64fa1e: docs: fix a couple typos	Scott Main	2011-06-23	2	-2/+2
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	docs: fix a couple typos	Scott Main	2011-06-20	2	-2/+2
* \| \| \| \| \|	am 35837c32: am 20fe290e: am beeb7762: docs: fix broken link	Scott Main	2011-06-23	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| / \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	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
\| \| \| \|_\|/ / / \| \| \|/\| \| \| \|