Leon Scroggins III f761fa7767 Merge "Remove calls to deprecated SkBitmap::setIsOpaque()"

2014-01-15 18:34:19 +00:00

..

java/android

Merge "Unhide android.media.AudioTrack.setVolume(float)"

2014-01-15 17:58:53 +00:00

jni

am 28f032e6: am e2c046fe: am 13249411: am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig"

2014-01-14 16:25:18 +00:00

lib

resolved conflicts for merge of e0b14ea7 to master

2013-12-13 15:59:51 -08:00

mca

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

tests

Remove calls to deprecated SkBitmap::setIsOpaque()

2014-01-15 11:37:04 -05:00