commit | 4fc4f46ff7a3aa4536ec1b1faeaac492329492f3 | [log] [tgz] |
---|---|---|
author | Deepanshu Gupta <deepanshu@google.com> | Wed Nov 13 08:45:54 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 13 08:45:54 2013 -0800 |
tree | 252c01f0dbb59ce3b6c899ce1a6e7f863d9454f8 | |
parent | e1ce53209a0a2f2d9b6e527eb5ace1ab2db648e1 [diff] | |
parent | f7400aa1da0b3604dbb5fc1bf4b4242a8e65e860 [diff] |
am f7400aa1: (-s ours) am 6870d29c: am 78cfdf31: Update changed delegate method in Bitmap_Delegate. DO NOT MERGE * commit 'f7400aa1da0b3604dbb5fc1bf4b4242a8e65e860': Update changed delegate method in Bitmap_Delegate. DO NOT MERGE