Merge commit '77f77f904a8cb13dc2cd921b253658072389e95f' into eclair-plus-aosp
* commit '77f77f904a8cb13dc2cd921b253658072389e95f':
Add support for selecting the color bit depth and if the application used a depth buffer.
Merge commit '4025dbd97e7e800e9a75f76664453bdb2971c132' into eclair-plus-aosp
* commit '4025dbd97e7e800e9a75f76664453bdb2971c132':
Only try to sync to subscribedfeeds for google acounts.
Merge commit '617b22dc075bbf704421adf15f39388ec098b4fd' into eclair-plus-aosp
* commit '617b22dc075bbf704421adf15f39388ec098b4fd':
Add local frames for parsing properties and processing events.
We were running out of local refs when there are lots of devices.
Instead of deleting every single local ref, create a local stack frame.
This operation is inexpensive so doesn't add a high overload and keeps
the code clean instead of deleting every single local ref.
Merge commit '5fe00057dd611fda30f44edb98771e38bf452ecd' into eclair-plus-aosp
* commit '5fe00057dd611fda30f44edb98771e38bf452ecd':
- make it ok to modify the accounts before boot
Merge commit '91ba1c3f9d000928a4ba12d45d609b1c2e7066e7' into eclair-plus-aosp
* commit '91ba1c3f9d000928a4ba12d45d609b1c2e7066e7':
Revert volume if it wasn't okayed by user.
- 'setPermanentlyLocked(false)' no longer automatically resets the pattern
- new string for "waiting to verify account" progress dialog
- new string for account unlock screen title when you aren't past the too many
attempts, but just hit the 'forgot pattern' button
Merge commit '4804c3e23b0bb8e77b690df177ebd4d6fb949aa8' into eclair-plus-aosp
* commit '4804c3e23b0bb8e77b690df177ebd4d6fb949aa8':
Add an extra intent parameter for recording duration limit.
Merge commit 'f7eab4f78fe4bdb193a4f8caf2648d2cb3ef36ea' into eclair-plus-aosp
* commit 'f7eab4f78fe4bdb193a4f8caf2648d2cb3ef36ea':
Don't use deprecated API in contact header widget.
Merge commit 'd6bfef3647162785bc3206c2d4e3e8ceba1dca45' into eclair-plus-aosp
* commit 'd6bfef3647162785bc3206c2d4e3e8ceba1dca45':
fix a bug recently introduced where EGL couldn't be initialized again after it had been terminated once
Merge commit '45e38f84612eee82d53bf8be2776be79c7d8c015' into eclair-plus-aosp
* commit '45e38f84612eee82d53bf8be2776be79c7d8c015':
Filter out worker tests from layout suite because merely disabling worker in webview settings no longer works.
Merge commit '0d05be3f724740eb95ac5acd9819b4db0eccd694' into eclair-plus-aosp
* commit '0d05be3f724740eb95ac5acd9819b4db0eccd694':
Fix bug that would leave old windows around.
Merge commit '094f44ba6c8e70dc38a4f8d9ac5f20890e4477da' into eclair-plus-aosp
* commit '094f44ba6c8e70dc38a4f8d9ac5f20890e4477da':
Use correct UUID to authorize AVRCP
The problem was instigated by another fix I made to keep
windows around while their tokens are animating or preparing to
animate. This then hit an issue where if the window's process
died while its token was getting ready to animate, we would
immediately hide the token, and when we then went to start
the token animation we wouldn't do anything, leaving the old
dummy animation in place and not allowing it to run.
Now we clear the animation before hiding the token, to ensure
the dummy animation is gone at this point.
Change-Id: If83fadcce6815bc545c80fbdb82fe6972bbdf5ef
Merge commit '0badd0b700ed618dac421cb6cde4654b51acb3a4' into eclair-plus-aosp
* commit '0badd0b700ed618dac421cb6cde4654b51acb3a4':
Note net availability even when apn not enabled
Fixes a problem where mms apn was on when we lost the network (airplane mode) but mms was
off when airplane mode was turned off so it kept thinking we didn't have access and
future mms always failed.
bug: 2075145
Merge commit '4a51c20ce607c74914f90fd897f04080121ac13b' into eclair-plus-aosp
* commit '4a51c20ce607c74914f90fd897f04080121ac13b':
I am getting tired of the java doc warnings, so fix them.
