OSDN Git Service
Scott Main [Fri, 16 Dec 2011 06:12:08 +0000 (22:12 -0800)]
am
4faca92f: am
36c67785: docs: update homepage for 4.0.3 announcment
* commit '
4faca92faa13bcf5d6c2e76b226466066e5562a2':
docs: update homepage for 4.0.3 announcment
Scott Main [Fri, 16 Dec 2011 06:09:46 +0000 (22:09 -0800)]
am
36c67785: docs: update homepage for 4.0.3 announcment
* commit '
36c677855c0a54ede9e92aa856cb2250960e922e':
docs: update homepage for 4.0.3 announcment
Scott Main [Fri, 16 Dec 2011 04:24:47 +0000 (20:24 -0800)]
am
b193d241: am
4cb7d095: am
98af5edc: docs: fix encoding issue or whatever with docs (not showing titles)
* commit '
b193d24145d84a1748cfdcffae56ebfe549ef940':
docs: fix encoding issue or whatever with docs (not showing titles)
Scott Main [Fri, 16 Dec 2011 04:22:39 +0000 (20:22 -0800)]
am
4cb7d095: am
98af5edc: docs: fix encoding issue or whatever with docs (not showing titles)
* commit '
4cb7d0953534587ba2051c6536fdde4b2c9539d5':
docs: fix encoding issue or whatever with docs (not showing titles)
Scott Main [Fri, 16 Dec 2011 04:19:55 +0000 (20:19 -0800)]
am
98af5edc: docs: fix encoding issue or whatever with docs (not showing titles)
* commit '
98af5edc70b0b418366f5197b9aeef30f135d40e':
docs: fix encoding issue or whatever with docs (not showing titles)
Scott Main [Fri, 16 Dec 2011 04:01:28 +0000 (20:01 -0800)]
am
34e46115: am
8f266b9e: am
d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0
* commit '
34e46115a5cee1b0e186b450ef2598df999c5cbe':
docs: add remembering users class to nav
Scott Main [Fri, 16 Dec 2011 03:59:25 +0000 (19:59 -0800)]
am
8f266b9e: am
d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0
* commit '
8f266b9e348ba69d953568624b8d0e2cea07f99d':
docs: add remembering users class to nav
Scott Main [Fri, 16 Dec 2011 03:57:21 +0000 (19:57 -0800)]
am
98e4adf9: am
26e461b3: am
5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
* commit '
98e4adf942fe3ade14225875fdb018efe941e99f':
Doc merge from master:Training class on Identifying and Authenticating Users.
Scott Main [Fri, 16 Dec 2011 03:56:47 +0000 (19:56 -0800)]
am
d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0
* commit '
d9bc2d21c55e58f83e4209749cc51f0da9869b54':
docs: add remembering users class to nav
Scott Main [Fri, 16 Dec 2011 03:55:25 +0000 (19:55 -0800)]
Merge "docs: add remembering users class to nav" into ics-mr0
Scott Main [Fri, 16 Dec 2011 03:55:00 +0000 (19:55 -0800)]
am
26e461b3: am
5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
* commit '
26e461b34f5f9eef79aa30f1304cca4262ff88ed':
Doc merge from master:Training class on Identifying and Authenticating Users.
Scott Main [Fri, 16 Dec 2011 03:52:50 +0000 (19:52 -0800)]
am
5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
* commit '
5dac1976198e5fa553749cd145c7484f3ff45c6b':
Doc merge from master:Training class on Identifying and Authenticating Users.
Scott Main [Fri, 16 Dec 2011 03:52:14 +0000 (19:52 -0800)]
am
ec09b269: am
ce5643c7: am
abfcbd16: docs: typo in training orientation
* commit '
ec09b2691ef24e25d28d9946c722d154b6067224':
docs: typo in training orientation
Scott Main [Fri, 16 Dec 2011 03:51:48 +0000 (19:51 -0800)]
Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
Scott Main [Fri, 16 Dec 2011 03:49:50 +0000 (19:49 -0800)]
am
ce5643c7: am
abfcbd16: docs: typo in training orientation
* commit '
ce5643c7c43c2c680e683c56507ffa1bf5b9a316':
docs: typo in training orientation
Scott Main [Fri, 16 Dec 2011 03:47:47 +0000 (19:47 -0800)]
am
abfcbd16: docs: typo in training orientation
* commit '
abfcbd162ff0f3baf45436614a1ea7ce6c032df1':
docs: typo in training orientation
Roman Nurik [Fri, 16 Dec 2011 03:29:27 +0000 (19:29 -0800)]
am
0bc0e5e3: am
1584a816: am
408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0
* commit '
0bc0e5e35ae0939f85da5b79df69a6b6040bf496':
docs: Minor bugfix to Android U navigation design class
Roman Nurik [Fri, 16 Dec 2011 03:27:25 +0000 (19:27 -0800)]
am
1584a816: am
408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0
* commit '
1584a816ed2e431ae804954dc6bd2d9dc79a540e':
docs: Minor bugfix to Android U navigation design class
Dave Burke [Fri, 16 Dec 2011 03:27:17 +0000 (19:27 -0800)]
am
0cc1e42d: am
ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1
* commit '
0cc1e42d74e09c259a6da0abc9009d1abf7537b1':
SurfaceMediaSource: use the HW_TEXTURE usage bit
Roman Nurik [Fri, 16 Dec 2011 03:25:25 +0000 (19:25 -0800)]
am
408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0
* commit '
408f94b1478c62f953faf29b02c3af5d8d3c5e05':
docs: Minor bugfix to Android U navigation design class
Dave Burke [Fri, 16 Dec 2011 03:25:07 +0000 (19:25 -0800)]
am
ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1
* commit '
ac279de9d9fcfd59a336298cfdd5b1f4ab6d038f':
SurfaceMediaSource: use the HW_TEXTURE usage bit
Dave Burke [Fri, 16 Dec 2011 03:23:26 +0000 (19:23 -0800)]
Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1
Roman Nurik [Fri, 16 Dec 2011 03:23:00 +0000 (19:23 -0800)]
Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0
Jeff Sharkey [Fri, 16 Dec 2011 02:40:21 +0000 (18:40 -0800)]
Merge "Move NMS observers to RemoteCallbackList."
Scott Main [Fri, 16 Dec 2011 01:44:00 +0000 (17:44 -0800)]
am
6bbd38e9: am
aeb06e34: am
6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0
* commit '
6bbd38e98615d6a2d4d4e1401a9316bfe7736486':
Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
Scott Main [Fri, 16 Dec 2011 01:41:58 +0000 (17:41 -0800)]
am
aeb06e34: am
6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0
* commit '
aeb06e34085703fe9699cdc3454558d69092bd7c':
Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
Scott Main [Fri, 16 Dec 2011 01:41:50 +0000 (17:41 -0800)]
am
efc87005: am
5f0df1b8: am
580f0146: docs: add camera and design, remove users update title names for many lessons
* commit '
efc870052b0988446967a6100cf03a51c3b88ce1':
docs: add camera and design, remove users update title names for many lessons
Bart Sears [Fri, 16 Dec 2011 01:40:56 +0000 (17:40 -0800)]
Merge "Emoji characters for Android"
Scott Main [Fri, 16 Dec 2011 01:39:43 +0000 (17:39 -0800)]
am
5f0df1b8: am
580f0146: docs: add camera and design, remove users update title names for many lessons
* commit '
5f0df1b8db25859a1e99425cfd87562ef71e6478':
docs: add camera and design, remove users update title names for many lessons
Scott Main [Fri, 16 Dec 2011 01:39:35 +0000 (17:39 -0800)]
am
6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0
* commit '
6fbddffc83312b825e888fcdb8b6e52dade05b3e':
Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
Scott Main [Fri, 16 Dec 2011 01:37:36 +0000 (17:37 -0800)]
am
580f0146: docs: add camera and design, remove users update title names for many lessons
* commit '
580f0146535e7daed83aef721f505270f7b040e1':
docs: add camera and design, remove users update title names for many lessons
Scott Main [Fri, 16 Dec 2011 01:36:58 +0000 (17:36 -0800)]
Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0
Sparky Rhode [Fri, 16 Dec 2011 01:27:36 +0000 (17:27 -0800)]
am
165b3cc7: am
ea627994: am
fc3f8e69: Merge "Remove references to sample application" into ics-mr0
* commit '
165b3cc73fdc6fdee1c1ba1272ffd4cdb70b9cab':
Remove references to sample application
Sparky Rhode [Fri, 16 Dec 2011 01:25:28 +0000 (17:25 -0800)]
am
ea627994: am
fc3f8e69: Merge "Remove references to sample application" into ics-mr0
* commit '
ea627994c3940711c27e27a6d5d98bb135944710':
Remove references to sample application
Sparky Rhode [Fri, 16 Dec 2011 01:23:11 +0000 (17:23 -0800)]
am
fc3f8e69: Merge "Remove references to sample application" into ics-mr0
* commit '
fc3f8e69546ff2ea672b2c66e861424a8cf2348f':
Remove references to sample application
Sparky Rhode [Fri, 16 Dec 2011 01:21:51 +0000 (17:21 -0800)]
Merge "Remove references to sample application" into ics-mr0
Roman Nurik [Fri, 16 Dec 2011 00:52:47 +0000 (16:52 -0800)]
am
eb49c9c3: am
eb623347: am
d37e2b35: Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0
* commit '
eb49c9c33c7ddeb5150bfea0f432226ff7730bfe':
Android U Class: Designing Effective and Intuitive App Navigation
Roman Nurik [Fri, 16 Dec 2011 00:50:23 +0000 (16:50 -0800)]
am
eb623347: am
d37e2b35: Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0
* commit '
eb623347f9a0c46e6ccf5791c03f99d37a0b65f8':
Android U Class: Designing Effective and Intuitive App Navigation
Roman Nurik [Fri, 16 Dec 2011 00:48:25 +0000 (16:48 -0800)]
am
d37e2b35: Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0
* commit '
d37e2b35b4ad80352eca9e77b59d78f1bcf65b8c':
Android U Class: Designing Effective and Intuitive App Navigation
Roman Nurik [Fri, 16 Dec 2011 00:45:55 +0000 (16:45 -0800)]
Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0
Scott Main [Fri, 16 Dec 2011 00:34:21 +0000 (16:34 -0800)]
am
52507ccd: am
6aee4582: am
2cbcdc76: Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0
* commit '
52507ccd17787a82cebe3b86e93c6e197b74d9c1':
docs: Add training homepage, side nav, and title changes
Scott Main [Fri, 16 Dec 2011 00:31:54 +0000 (16:31 -0800)]
am
6aee4582: am
2cbcdc76: Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0
* commit '
6aee4582feae70254094e343412114c0b0abaf2d':
docs: Add training homepage, side nav, and title changes
Scott Main [Fri, 16 Dec 2011 00:29:42 +0000 (16:29 -0800)]
am
2cbcdc76: Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0
* commit '
2cbcdc760cfe2af622ccb9ef41514954dab537f0':
docs: Add training homepage, side nav, and title changes
Scott Main [Fri, 16 Dec 2011 00:28:19 +0000 (16:28 -0800)]
Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0
Glenn Kasten [Fri, 16 Dec 2011 00:17:04 +0000 (16:17 -0800)]
Merge "Improve resistance to leaks for ConfigEvent"
Glenn Kasten [Fri, 16 Dec 2011 00:16:55 +0000 (16:16 -0800)]
Merge "Use NULL not 0 for pointers"
Scott Main [Fri, 16 Dec 2011 00:14:36 +0000 (16:14 -0800)]
am
6e37a304: am
fc6ac0f2: am
564e8aa4: docs: Android University - Camera class
* commit '
6e37a304c6e7eed667c1d692c2ad501ec025a254':
docs: Android University - Camera class
Scott Main [Fri, 16 Dec 2011 00:12:23 +0000 (16:12 -0800)]
am
fc6ac0f2: am
564e8aa4: docs: Android University - Camera class
* commit '
fc6ac0f28f9f7d06963fb330b218376099a91596':
docs: Android University - Camera class
Scott Main [Fri, 16 Dec 2011 00:10:10 +0000 (16:10 -0800)]
am
564e8aa4: docs: Android University - Camera class
* commit '
564e8aa41c29ebd10cb691851d4ecc347f8eee71':
docs: Android University - Camera class
Scott Main [Fri, 16 Dec 2011 00:00:48 +0000 (16:00 -0800)]
am
608461ff: am
19552e95: am
d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
* commit '
608461ffd5f3146c39a69496d275d7dabf1e2f90':
cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
Scott Main [Thu, 15 Dec 2011 23:58:33 +0000 (15:58 -0800)]
am
19552e95: am
d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
* commit '
19552e95db26d96977daa42cda4de8e58c6feb0a':
cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
Scott Main [Thu, 15 Dec 2011 23:55:31 +0000 (15:55 -0800)]
am
d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
* commit '
d25ad2fdbb4cf86e2a05dbc6b8afb50760c0fe1b':
cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
Jeff Sharkey [Thu, 15 Dec 2011 23:37:21 +0000 (15:37 -0800)]
Merge "Restrict app data on metered networks."
Marco Nelissen [Thu, 15 Dec 2011 22:41:36 +0000 (14:41 -0800)]
Merge "Add ContentProvider.dump()"
Scott Main [Thu, 15 Dec 2011 21:16:27 +0000 (13:16 -0800)]
am
a739235a: am
43834487: docs: remove some "new" tags from side navs
* commit '
a739235aed598fbd40c63d5e01e8bf55836b0de0':
docs: remove some "new" tags from side navs
Scott Main [Thu, 15 Dec 2011 21:14:41 +0000 (13:14 -0800)]
am
43834487: docs: remove some "new" tags from side navs
* commit '
43834487a183b69783b0de270f9b761f3afffdc1':
docs: remove some "new" tags from side navs
Jeff Sharkey [Thu, 15 Dec 2011 19:53:05 +0000 (11:53 -0800)]
Merge "Move NMS to CONNECTIVITY_INTERNAL permission."
Jeff Sharkey [Thu, 15 Dec 2011 19:51:32 +0000 (11:51 -0800)]
Merge "Clear reply before writing exception."
Scott Main [Thu, 15 Dec 2011 19:13:31 +0000 (11:13 -0800)]
am
7e065061: am
481cd5a8: am
3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience
* commit '
7e065061bb47fe88421a6edf62c846144e30fcd8':
Android U Class: Monetization / Ads without Compromising User Experience
Scott Main [Thu, 15 Dec 2011 19:11:39 +0000 (11:11 -0800)]
am
481cd5a8: am
3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience
* commit '
481cd5a8938b5055942f3a9ccaeb08f373b8a4ea':
Android U Class: Monetization / Ads without Compromising User Experience
Scott Main [Thu, 15 Dec 2011 19:08:51 +0000 (11:08 -0800)]
am
3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience
* commit '
3d672e1e789e171e913605945efe95a477ab0505':
Android U Class: Monetization / Ads without Compromising User Experience
Glenn Kasten [Thu, 15 Dec 2011 18:46:14 +0000 (10:46 -0800)]
Merge "Fix build error when verbose logging is enabled"
Scott Main [Thu, 15 Dec 2011 18:45:50 +0000 (10:45 -0800)]
am
fbc17ecc: am
cf927f22: am
aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
* commit '
fbc17eccea267c7cee344ac7e7898709f86b37df':
Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
Scott Main [Thu, 15 Dec 2011 18:43:46 +0000 (10:43 -0800)]
am
cf927f22: am
aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
* commit '
cf927f229f55849caf3461621023b5bd61908334':
Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
Scott Main [Thu, 15 Dec 2011 18:41:18 +0000 (10:41 -0800)]
am
aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
* commit '
aed4ced6556383483209f454c9e4872e8ad28ebf':
Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
Martijn Coenen [Thu, 15 Dec 2011 18:32:11 +0000 (10:32 -0800)]
Merge "Fix NPE on mock NDEF tech operations."
Scott Main [Thu, 15 Dec 2011 18:17:15 +0000 (10:17 -0800)]
am
ecaee21d: am
e4e6c066: am
f9cca66e: Docs: Training class on Identifying and Authenticating Users.
* commit '
ecaee21d3050f34bcb8c6d4bafec9764ab1a7027':
Docs: Training class on Identifying and Authenticating Users.
Scott Main [Thu, 15 Dec 2011 18:15:21 +0000 (10:15 -0800)]
am
e4e6c066: am
f9cca66e: Docs: Training class on Identifying and Authenticating Users.
* commit '
e4e6c06641a6446c0f26a0ac59c665f34476a6b4':
Docs: Training class on Identifying and Authenticating Users.
Scott Main [Thu, 15 Dec 2011 18:13:07 +0000 (10:13 -0800)]
am
f9cca66e: Docs: Training class on Identifying and Authenticating Users.
* commit '
f9cca66e8b4acbc8d50713b4ed4b92d8274285c1':
Docs: Training class on Identifying and Authenticating Users.
Victoria Lease [Thu, 15 Dec 2011 17:59:42 +0000 (09:59 -0800)]
Merge "URL-decode tel: URIs."
Romain Guy [Thu, 15 Dec 2011 03:25:20 +0000 (19:25 -0800)]
Merge "Generate even fewer GL commands"
Dianne Hackborn [Thu, 15 Dec 2011 02:21:29 +0000 (18:21 -0800)]
am
13299a33: am
399f1df3: Merge "Fix some java docs." into ics-mr1
* commit '
13299a33e14562a5de14c89ad058d28ab0cd9f37':
Fix some java docs.
Dianne Hackborn [Thu, 15 Dec 2011 02:19:42 +0000 (18:19 -0800)]
am
399f1df3: Merge "Fix some java docs." into ics-mr1
* commit '
399f1df38594ea8bc927ad23bfbde996a9dc161d':
Fix some java docs.
Dianne Hackborn [Thu, 15 Dec 2011 02:18:29 +0000 (18:18 -0800)]
Merge "Fix some java docs." into ics-mr1
Glenn Kasten [Thu, 15 Dec 2011 01:35:36 +0000 (17:35 -0800)]
Merge "Fix indentation and whitespace"
Glenn Kasten [Thu, 15 Dec 2011 01:35:23 +0000 (17:35 -0800)]
Merge "Improve AudioFlinger error logging"
Glenn Kasten [Thu, 15 Dec 2011 01:35:14 +0000 (17:35 -0800)]
Merge "AudioMixer uninitialized simple fields"
Dirk Dougherty [Thu, 15 Dec 2011 01:24:46 +0000 (17:24 -0800)]
am
41d90f39: am
26bd66df: Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1
* commit '
41d90f39a5c40e3036e15efef5b07789296c8bb9':
Doc change: add MR1 API summary and updated highlights.
Dirk Dougherty [Thu, 15 Dec 2011 01:22:59 +0000 (17:22 -0800)]
am
26bd66df: Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1
* commit '
26bd66df4fc8caa7885fe3a4e78e379389a24a94':
Doc change: add MR1 API summary and updated highlights.
Dirk Dougherty [Thu, 15 Dec 2011 01:21:13 +0000 (17:21 -0800)]
Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1
Glenn Kasten [Thu, 15 Dec 2011 00:56:31 +0000 (16:56 -0800)]
Merge "Audio C++ comments"
The Android Open Source Project [Thu, 15 Dec 2011 00:08:46 +0000 (16:08 -0800)]
am
b14436d0: Reconcile with ics-mr1-release
* commit '
b14436d0700f6e837e4d6066ddcf672c61d7f033':
Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit
9f704f6c46a171357e49c411c83458b9d4565f3b.
The Android Open Source Project [Thu, 15 Dec 2011 00:05:32 +0000 (16:05 -0800)]
Reconcile with ics-mr1-release
Change-Id: I1b745b11729a3fda14ffe44f1f44854e087318c7
Glenn Kasten [Wed, 14 Dec 2011 23:40:43 +0000 (15:40 -0800)]
Merge "Remove unnecessary this->"
Glenn Kasten [Wed, 14 Dec 2011 23:40:35 +0000 (15:40 -0800)]
Merge "Use const char correctly in AudioFlinger"
Glenn Kasten [Wed, 14 Dec 2011 23:40:27 +0000 (15:40 -0800)]
Merge "Use units after all times"
Glenn Kasten [Wed, 14 Dec 2011 23:40:18 +0000 (15:40 -0800)]
Merge "Fix typo in error message, missing space"
Glenn Kasten [Wed, 14 Dec 2011 23:40:11 +0000 (15:40 -0800)]
Merge "Delete obsolete includes"
Glenn Kasten [Wed, 14 Dec 2011 23:40:01 +0000 (15:40 -0800)]
Merge "Remove redundant clear()"
Glenn Kasten [Wed, 14 Dec 2011 23:39:52 +0000 (15:39 -0800)]
Merge "Fix includes"
Jaikumar Ganesh [Wed, 14 Dec 2011 23:25:25 +0000 (15:25 -0800)]
Merge "Change the fd to be blocking for health profile."
Glenn Kasten [Wed, 14 Dec 2011 23:05:56 +0000 (15:05 -0800)]
Merge "AudioTrack::setVolume check range"
Scott Main [Wed, 14 Dec 2011 23:00:59 +0000 (15:00 -0800)]
am
5ebf8fbb: am
d1f2b7cc: am
56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
* commit '
5ebf8fbb1e925d411d928757712c41a7cafe8231':
docs: add Android U class for "Improving Performance of Layouts"
Scott Main [Wed, 14 Dec 2011 22:58:02 +0000 (14:58 -0800)]
am
d1f2b7cc: am
56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
* commit '
d1f2b7ccb7e8672f0af9f940864111c8dbe1ff80':
docs: add Android U class for "Improving Performance of Layouts"
Scott Main [Wed, 14 Dec 2011 22:57:50 +0000 (14:57 -0800)]
am
d8dec142: am
b8ea1f93: am
4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0
* commit '
d8dec14201250055fe9bcccead361168c839d9f9':
doc change: Android U lessons for audio and battery
Scott Main [Wed, 14 Dec 2011 22:56:02 +0000 (14:56 -0800)]
am
b8ea1f93: am
4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0
* commit '
b8ea1f93bb97c2aa0a3fffaa12aaaa8923449b4c':
doc change: Android U lessons for audio and battery
Scott Main [Wed, 14 Dec 2011 22:55:44 +0000 (14:55 -0800)]
am
56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
* commit '
56a3e326192c7496b67666b29071dc9f38c59da9':
docs: add Android U class for "Improving Performance of Layouts"
Scott Main [Wed, 14 Dec 2011 22:53:40 +0000 (14:53 -0800)]
am
4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0
* commit '
4dc763c700f79e33030e96eefabf8e5047cb9cb1':
doc change: Android U lessons for audio and battery
Scott Main [Wed, 14 Dec 2011 22:53:04 +0000 (14:53 -0800)]
Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
Scott Main [Wed, 14 Dec 2011 22:51:30 +0000 (14:51 -0800)]
Merge "doc change: Android U lessons for audio and battery" into ics-mr0
OSDN Git Service
