Merge commit '657bf5b751b7d2008dff0f91082a75bc1d699fa9'
* commit '657bf5b751b7d2008dff0f91082a75bc1d699fa9':
Revert volume if it wasn't okayed by user.
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 'c607435cae64d2f9c7af408e10e1e72eb637c458'
* commit 'c607435cae64d2f9c7af408e10e1e72eb637c458':
Add an extra intent parameter for recording duration limit.
Merge commit '4804c3e23b0bb8e77b690df177ebd4d6fb949aa8' into eclair-plus-aosp
* commit '4804c3e23b0bb8e77b690df177ebd4d6fb949aa8':
Add an extra intent parameter for recording duration limit.
Merge commit '4ce07160ec6030b3afdd22867e39ca818c5e44c4'
* commit '4ce07160ec6030b3afdd22867e39ca818c5e44c4':
Don't use deprecated API in contact header widget.
Merge commit 'f7eab4f78fe4bdb193a4f8caf2648d2cb3ef36ea' into eclair-plus-aosp
* commit 'f7eab4f78fe4bdb193a4f8caf2648d2cb3ef36ea':
Don't use deprecated API in contact header widget.
Merge commit 'e420f4a9bc5ce95c4b7d063dc257671e41aee453'
* commit 'e420f4a9bc5ce95c4b7d063dc257671e41aee453':
fix a bug recently introduced where EGL couldn't be initialized again after it had been terminated once
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 '9320cf652d94917b7945f03786450e418923cb72'
* commit '9320cf652d94917b7945f03786450e418923cb72':
Filter out worker tests from layout suite because merely disabling worker in webview settings no longer works.
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 'd8a0f458981037194841457422fd38c2dadb599d'
* commit 'd8a0f458981037194841457422fd38c2dadb599d':
Fix bug that would leave old windows around.
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 '7a47b54f13566892839da8edeac182bfc0f94bc9'
* commit '7a47b54f13566892839da8edeac182bfc0f94bc9':
Note net availability even when apn not enabled
Merge commit '0badd0b700ed618dac421cb6cde4654b51acb3a4' into eclair-plus-aosp
* commit '0badd0b700ed618dac421cb6cde4654b51acb3a4':
Note net availability even when apn not enabled
