OSDN Git Service

am 0de2eca5: am 112e35b4: Merge "Update generationId on bitmaps when decoded into...
authorChris Craik <ccraik@google.com>
Thu, 15 Jan 2015 23:15:56 +0000 (23:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 15 Jan 2015 23:15:56 +0000 (23:15 +0000)
commit04b633c526b3ea72cb13f0c0472673f3baf07625
treeb424366fb053d0afe897e8da3515c5024fb977af
parent78dfb182d29259630277ee40d51c7350df1e7dac
parent0de2eca5fc439e2622cc0cc5a54cd9a5938f67c6
am 0de2eca5: am 112e35b4: Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev

* commit '0de2eca5fc439e2622cc0cc5a54cd9a5938f67c6':
  Update generationId on bitmaps when decoded into by BitmapRegionDecoder
core/jni/android/graphics/BitmapRegionDecoder.cpp