OSDN Git Service

am 03332473: Make convertBitmap() protected so that Frames can use it.
authornicolasroard <nicolasroard@google.com>
Tue, 16 Apr 2013 23:14:24 +0000 (16:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Apr 2013 23:14:24 +0000 (16:14 -0700)
* commit '0333247337b910bb981c6ba17ca0cc76d5b614ff':
  Make convertBitmap() protected so that Frames can use it.


Trivial merge