Merge commit 'e29146158b6048936671decc060d398a68333fc0'
* commit 'e29146158b6048936671decc060d398a68333fc0':
Hook up the backup data writer, and add a utility to read the backup data files.
* changes:
Increment BatteryStatsImpl's VERSION. That'll make it stop trying to interpret older records with the new format. Also applied other comments involving name changes to remove un-needed 'Wifi' labels in WifiManager API, etc.
Merge commit 'a59aba8cd88b8f98fa4de2a903899bc6ac9f73e8'
* commit 'a59aba8cd88b8f98fa4de2a903899bc6ac9f73e8':
Update more references to openInputStream in support classes.
Modify AudioFlinger to use updated openInputStream factory method.
Merge commit '90bd7338df76c0a6185f4ff2fe7f981fa1a1d36c'
* commit '90bd7338df76c0a6185f4ff2fe7f981fa1a1d36c':
Fix bad filtering of error code when set_position_mode() is being called.
Merge commit '5bc21aa0671d83e406b46e0431816dea8d9ca5cb'
* commit '5bc21aa0671d83e406b46e0431816dea8d9ca5cb':
SmsHeader rewrite, in preparation for migration to public API.
Merge commit '95fc68f24a2a93e5664e2234abcfe479d385cc05'
* commit '95fc68f24a2a93e5664e2234abcfe479d385cc05':
Fix issue where apps could prevent the user from going home.
* changes:
Update more references to openInputStream in support classes. Continuation of bug 1846343
Modify AudioFlinger to use updated openInputStream factory method. Continuation of bug 1846343
Merge commit '83a6ec600259d245b799a99a8e963704db031a63'
* commit '83a6ec600259d245b799a99a8e963704db031a63':
Add a method to get the PhoneType in CellLocation.
Merge commit 'eba1ffb1468ce348bcd55a2d200728d5ac3b1eb3'
* commit 'eba1ffb1468ce348bcd55a2d200728d5ac3b1eb3':
TextView was not setting the callback on its compound drawables, thus preventing them from refreshing the view when updating their internal state. This would for instance prevent animated drawables from actually animating. Quite infuriating.
* changes:
TextView was not setting the callback on its compound drawables, thus preventing them from refreshing the view when updating their internal state. This would for instance prevent animated drawables from actually animating. Quite infuriating.
Merge commit '379d3bd974cfde9480fda733d4f442311924cbb9'
* commit '379d3bd974cfde9480fda733d4f442311924cbb9':
Replaced the old test media files with the new open source test media files.
Merge commit 'f9df6bd6e92fcef6bc32225bde412d3b1c0df180'
* commit 'f9df6bd6e92fcef6bc32225bde412d3b1c0df180':
Fixes external #2686. Make @android:anim/linear_interpolator public since the default intperpolator for all animations is accelerate_decelerate.
* changes:
Fixes external #2686. Make @android:anim/linear_interpolator public since the default intperpolator for all animations is accelerate_decelerate.
Merge commit '988c4d1a3ece97c078658a67b15949db900641e0'
* commit '988c4d1a3ece97c078658a67b15949db900641e0':
Added the write sdcard permission so that the mediarecorder test
Merge commit '3e458241d9930465a20a861ecb42744355d48e48'
* commit '3e458241d9930465a20a861ecb42744355d48e48':
process: Add setProcessGroup() hidden API call to set the cgroup of
Merge commit '65ff54c44bbd8c1dd6818d42b7c91c634c644aa9'
* commit '65ff54c44bbd8c1dd6818d42b7c91c634c644aa9':
Document the media scanner's flow through native and java code, since
