Merge commit '1bfe73d0b1d338f3c16a8177eb8de509e44a5c01' into eclair-plus-aosp
* commit '1bfe73d0b1d338f3c16a8177eb8de509e44a5c01':
Filter devices by UUID and then class.
The settings app has been updated to use UUIDs.
When there is a filter type set for device picket UI, use the
UUIDs first and then the class bits.
Change-Id: Ifde5dbc3a1cf25babce4c686002315aa3933de59
Merge commit '9045631186a4f7fcf49a3f4700276ad8fbcab90c' into eclair-plus-aosp
* commit '9045631186a4f7fcf49a3f4700276ad8fbcab90c':
b/2126036 Improve remote device capability identification by switching to use UUIDs instead of class bits.
Merge commit '031ba6a3648367d307596f11b94367e50651397b' into eclair-plus-aosp
* commit '031ba6a3648367d307596f11b94367e50651397b':
SecuritySettings: use Credentials instead of CertTool.
Merge commit '59d1977ccd2ad686c39770aad31cae04a5c8d457' into eclair-plus-aosp
* commit '59d1977ccd2ad686c39770aad31cae04a5c8d457':
WifiSettings: use Credentials instead of CertTool.
Merge commit '30f8a38786c63796ba9914adfdd45b4134adbbb3'
* commit '30f8a38786c63796ba9914adfdd45b4134adbbb3':
Remove long animation setting (standard length is now longer).
Merge commit '8c212ef4cfd911ba80dd256cab7a3f997e2cb8cc' into eclair-plus-aosp
* commit '8c212ef4cfd911ba80dd256cab7a3f997e2cb8cc':
Remove long animation setting (standard length is now longer).
Merge commit '5466090cb8bb8f93423a19902157e6cea8c4fc62'
* commit '5466090cb8bb8f93423a19902157e6cea8c4fc62':
Change default filter to third party when launched via settings and all apps when launched via
Merge commit '9e7105108ba0aecc961b2ecc3003a57242c982bc' into eclair-plus-aosp
* commit '9e7105108ba0aecc961b2ecc3003a57242c982bc':
Change default filter to third party when launched via settings and all apps when launched via
* changes:
Change default filter to third party when launched via settings and all apps when launched via low storage. Update string name. fix padding for Force Stop button Change message when clearing application data.
Merge commit 'e32e8baa44f10749518cffdc6a9a47130fb3e19d' into eclair-plus-aosp
* commit 'e32e8baa44f10749518cffdc6a9a47130fb3e19d':
Fix the typo in phase2 options.
Merge commit '35b21807e81fada6df6d1ab898ed189ec1994d4e'
* commit '35b21807e81fada6df6d1ab898ed189ec1994d4e':
Use the ratio of different CPU speeds to compute CPU power consumption per app.
Merge commit 'd459bebd89756a8b735feb6f27bd864b0427feb7' into eclair-plus-aosp
* commit 'd459bebd89756a8b735feb6f27bd864b0427feb7':
Use the ratio of different CPU speeds to compute CPU power consumption per app.
Merge commit '6c1ac291d9f8adacc5dd3b8b5f08a11dced53ecb'
* commit '6c1ac291d9f8adacc5dd3b8b5f08a11dced53ecb':
Fix the issue WiFi UI IP settings lost when change slider state before save IP settings
Merge commit 'dc543d289884386faa1361d8fca5536a59c72c1a' into eclair-plus-aosp
* commit 'dc543d289884386faa1361d8fca5536a59c72c1a':
Fix the issue WiFi UI IP settings lost when change slider state before save IP settings
Merge commit 'f66beeaea7d3654bee280644f4edc6d7215b0ee5' into eclair-plus-aosp
* commit 'f66beeaea7d3654bee280644f4edc6d7215b0ee5':
Follow along with startActivityPendingIntent() change.
Merge commit '909a945031ec5ec372991de1d2ea1718f494ab9c' into eclair-plus-aosp
* commit '909a945031ec5ec372991de1d2ea1718f494ab9c':
Import revised translations. DO NOT MERGE
Merge commit '87f0c26b31f14860f4db564362087d7bc91f27cb'
* commit '87f0c26b31f14860f4db564362087d7bc91f27cb':
Use new memory API; show memory used by bg and fg processes.
Merge commit '3faa23a2b0dcd0a19acf7b24e7eea36d67b4eda1' into eclair-plus-aosp
* commit '3faa23a2b0dcd0a19acf7b24e7eea36d67b4eda1':
Use new memory API; show memory used by bg and fg processes.
Merge commit '04f3b82137ae952f0e0653b9fdd1cf8d8d08afd7'
* commit '04f3b82137ae952f0e0653b9fdd1cf8d8d08afd7':
Fix issues with updating list when applications get installed while ManageApps is paused or stopped.
