Merge commit 'e7eb3a35fe35b858597410d4b41c9d027c4b83c3' into kraken
* commit 'e7eb3a35fe35b858597410d4b41c9d027c4b83c3':
Fix preloaded classes for API rename of BackupAgentHelper
Merge commit '8c6af52fdd572e19cd40a0be53615eb6c80ccde5' into froyo-plus-aosp
* commit '8c6af52fdd572e19cd40a0be53615eb6c80ccde5':
Fix preloaded classes for API rename of BackupAgentHelper
Merge commit '8d0dc62fe26e02a3a303c9286b06fc0c24c36dcb' into kraken
* commit '8d0dc62fe26e02a3a303c9286b06fc0c24c36dcb':
Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
Merge commit 'ef3f5ddc2137ed99e41f00441b688fb56b855179' into froyo-plus-aosp
* commit 'ef3f5ddc2137ed99e41f00441b688fb56b855179':
Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
Bug #2553187
Limit the max number of lines for each entry in the ResolveActivity to 2. Also
make sure to discard potential styling tags and newlines/space characters from
package name and activity labels.
Change-Id: Ibda3688267aa948b921164d3d3abc8c9236e61a2
Merge commit '245df5ad16ff227761906c10dc97c01901232666' into kraken
* commit '245df5ad16ff227761906c10dc97c01901232666':
API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council
Merge commit '6874362a6b3e0b75f42a2d1bf266eb2d25580b47' into kraken
* commit '6874362a6b3e0b75f42a2d1bf266eb2d25580b47':
fix [2542425] memory leak during video recording
Merge commit '3f264c4fba416f55247da3fafd6afbe55bf93598' into froyo-plus-aosp
* commit '3f264c4fba416f55247da3fafd6afbe55bf93598':
API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council
Merge commit '04fdd180cc64f2724c8b8598f1b8495fb1fa1d93' into froyo-plus-aosp
* commit '04fdd180cc64f2724c8b8598f1b8495fb1fa1d93':
fix [2542425] memory leak during video recording
Merge commit '6c75455908579c1bd48777847c0861967bc413a9' into kraken
* commit '6c75455908579c1bd48777847c0861967bc413a9':
doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes.
Merge commit '538c310b091a6cc74020423deed9d62703f3f13f' into kraken
* commit '538c310b091a6cc74020423deed9d62703f3f13f':
Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB.
Merge commit 'c46f28dc0fde1889b37bdc7066ec2af96c16e358' into froyo-plus-aosp
* commit 'c46f28dc0fde1889b37bdc7066ec2af96c16e358':
doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes.
Merge commit '02a1f78987a1e6bfa361806fcd3b0a02783b09b9' into froyo-plus-aosp
* commit '02a1f78987a1e6bfa361806fcd3b0a02783b09b9':
Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB.
glEGLImageTargetRenderbufferOES() pass the wrapped EGLImage
to the implementation, rather than the unwrapped one.
Change-Id: I149f9ed73e6ab9089110600e1db4311ba7a8c83a
I also realized the ROTATION_NN constants were misdocumented, they
actually align the opposite direction from the "orientation" angle
computed in the code (i.e. orientation=90 is left side up, ROTATION_90
is right side up). I just changed the comment here to keep the change
minimal; I'll update the code to be more consistent outside of this
release branch.
Bug: 2549875
Change-Id: I79c4286be582a21e730b25a8a24f2e1137c6e4cb
Merge commit '9d59c70a5599da86cf8ba0c3f5eddf9af08cf71b' into kraken
* commit '9d59c70a5599da86cf8ba0c3f5eddf9af08cf71b':
doc change: Indicate that only the first 8 characters of the key alias are used.
