Merge commit 'a85c4f165137ab360879bd9129259690ab6ac05d'
* commit 'a85c4f165137ab360879bd9129259690ab6ac05d':
This was marked @Deprecated in the docs, but it was misspelled.
Merge commit '03335af0dbf14d1eb4503be92a5b10199719898c'
* commit '03335af0dbf14d1eb4503be92a5b10199719898c':
Fix NPE when handling certain kinds of ANRs.
Merge commit 'd5d1328690b8f274059954e3c1bc9008c4e02dd7' into gingerbread-plus-aosp
* commit 'd5d1328690b8f274059954e3c1bc9008c4e02dd7':
This was marked @Deprecated in the docs, but it was misspelled.
Merge commit '567c00a86f748ad4d798ae50a09505cc051fc095' into gingerbread-plus-aosp
* commit '567c00a86f748ad4d798ae50a09505cc051fc095':
Fix NPE when handling certain kinds of ANRs.
Merge commit '7a848c0d7cb1978155ab7743aadb2e07bc4bdcc6'
* commit '7a848c0d7cb1978155ab7743aadb2e07bc4bdcc6':
A ThreadedSource wraps around an existing MediaSource and reads output buffers on a separate thread. It's now used for the vpx decoder to decode frames ahead of time to improve playback performance.
Merge commit 'f8a93cb7b9df2d6e84940b2f8741f8fd730d4c16'
* commit 'f8a93cb7b9df2d6e84940b2f8741f8fd730d4c16':
DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags.
Merge commit 'd35186ce1882b79db5aeaea7a5a6fdf4be89bcb8'
* commit 'd35186ce1882b79db5aeaea7a5a6fdf4be89bcb8':
These are not javadoc tags, they are annotations in sample code. Escape them properly.
Merge commit '4198cececf70bf034e12f19bb87f29cc29931c39' into gingerbread-plus-aosp
* commit '4198cececf70bf034e12f19bb87f29cc29931c39':
Fix the rest of the javadoc warnings.
Merge commit '8946ab2618a4eebfdf7b00c6b68e6a5d8432cafa' into gingerbread-plus-aosp
* commit '8946ab2618a4eebfdf7b00c6b68e6a5d8432cafa':
A ThreadedSource wraps around an existing MediaSource and reads output buffers on a separate thread. It's now used for the vpx decoder to decode frames ahead of time to improve playback performance.
Merge commit '8c9eacd9b9669642b052e3349d55c6a303f54b31' into gingerbread-plus-aosp
* commit '8c9eacd9b9669642b052e3349d55c6a303f54b31':
DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags.
Merge commit '37de5da03b33e85c2b0561b9a32e3c5395cfbc15' into gingerbread-plus-aosp
* commit '37de5da03b33e85c2b0561b9a32e3c5395cfbc15':
Fix problem in lvm effect bundle wrapper
Merge commit '7747795af508354b3792e497e6a7b4bc749b4007' into gingerbread-plus-aosp
* commit '7747795af508354b3792e497e6a7b4bc749b4007':
These are not javadoc tags, they are annotations in sample code. Escape them properly.
Merge commit 'd8f3d167353f6c6f6c5cb7a4c8e941c03b8e9511' into gingerbread-plus-aosp
* commit 'd8f3d167353f6c6f6c5cb7a4c8e941c03b8e9511':
Add a new phone state ANSWERING.
Merge commit '7642c82c291051919aad87c797e2dc1d77ed55e1'
* commit '7642c82c291051919aad87c797e2dc1d77ed55e1':
Make input dispatcher only ANR for foreground windows.
Merge commit '07980dc8a723c6a26003c1ebe74372a2b4fa6777' into gingerbread-plus-aosp
* commit '07980dc8a723c6a26003c1ebe74372a2b4fa6777':
Adding new assets for designers
Merge commit '1b60963c42e159aacc52d688defcac206e5ecec0'
* commit '1b60963c42e159aacc52d688defcac206e5ecec0':
Clarify the danger of READ_LOGS and DUMP permissions.
Merge commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f'
* commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f':
Fix the runtime restart due to name change.
Merge commit '4db458b4f71cd9ccbb98f5bf2c08e1f0eb750548'
* commit '4db458b4f71cd9ccbb98f5bf2c08e1f0eb750548':
Update camera API and javadoc for API review comments.
