* Added preliminary ButtonGroup support for buttons that display as a unit.
* Fixed a bug with MenuBuilder that caused old-style icon menus to fail.
* Added support for explicitly setting line height in text.
Change-Id: I1ba65f09dd9e1bc833d247ebe72052a21e3f99f0
Merge commit '390aceaf530b40702e0b30bd51b5eef793c0ac5a'
* commit '390aceaf530b40702e0b30bd51b5eef793c0ac5a':
DO NOT MERGE Set the cap at alpha to 80% of the total available.
Merge commit 'c8511af04a442551a204b1f47fabb317bcf54be0' into gingerbread-plus-aosp
* commit 'c8511af04a442551a204b1f47fabb317bcf54be0':
Add mock ril control commands and tests
Merge commit '748b413e94c73b760c63a03126df2c4712a1ae05'
* commit '748b413e94c73b760c63a03126df2c4712a1ae05':
GPS: Do not call sGpsInterface->init() multiple times
Merge commit '833db40866ebf27be33aa387d08a2cb0b9a4246d'
* commit '833db40866ebf27be33aa387d08a2cb0b9a4246d':
Do not release the wifi lock if the screen is off.
Merge commit '4c2c62fe08c736273dd9fb5910dedc7ecdc5f4b3'
* commit '4c2c62fe08c736273dd9fb5910dedc7ecdc5f4b3':
add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
Merge commit '37c8ad779fb171470af2757b5750c1b5f2d1f368'
* commit '37c8ad779fb171470af2757b5750c1b5f2d1f368':
DO NOT MERGE Limit the height of the pull glow.
Merge commit '59d5d966665dfebb1b03c4b1eba9eff3d9c797ce'
* commit '59d5d966665dfebb1b03c4b1eba9eff3d9c797ce':
docs: a few style adjustments to admin doc
There is a hard-coded limit to the frame rate of animations; this commit increases that rate by changing the inter-frame delay from 30 ms to 10 ms (although the actual delay will be determined by the maximum refresh rate of the system and the system load). For example, the effective maximum on current devices is 55 fps, or a delay of about 16 ms.
Change-Id: Id96a41cef36851e2d9508a98934f4b25595251ea
Merge commit 'cac43e8a2ce59c1151d5a2028330b2a769591d22'
* commit 'cac43e8a2ce59c1151d5a2028330b2a769591d22':
RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.
Merge commit '681f327e839a40a4d55d3567af341b9e90f62378'
* commit '681f327e839a40a4d55d3567af341b9e90f62378':
Fix retaining of granted permissions when updating of system app.
Merge commit 'c58e9bff10200daaad6d06d57745edcc33314325'
* commit 'c58e9bff10200daaad6d06d57745edcc33314325':
Maybe fix#3076572: phone process crashes in SipService, trying to get wifi lock
Merge commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c' into gingerbread-plus-aosp
* commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c':
Hold partial wakelock during shutdown to avoid entering sleep
Merge commit '0e430ccc2c8a4bb9d96002676d7742652bd28477' into gingerbread-plus-aosp
* commit '0e430ccc2c8a4bb9d96002676d7742652bd28477':
Telephony: Fix radio state printing
Merge commit 'fb1e5529724d121aa47485e7245b69965088fbb4' into gingerbread-plus-aosp
* commit 'fb1e5529724d121aa47485e7245b69965088fbb4':
Fix time zone info in kernel is nothing after reboot
Merge commit '6b8bdaa9c802746eabc4e96686739dbce34c2fbc' into gingerbread-plus-aosp
* commit '6b8bdaa9c802746eabc4e96686739dbce34c2fbc':
New AppsPermission and market style
