OSDN Git Service

resolved conflicts for merge of cb7cdd50 to klp-modular-dev-plus-aosp
authorNarayan Kamath <narayan@google.com>
Fri, 31 Jan 2014 12:08:17 +0000 (12:08 +0000)
committerNarayan Kamath <narayan@google.com>
Fri, 31 Jan 2014 12:08:17 +0000 (12:08 +0000)
commit98ac6c79a430e62a886b3a8278694425b5906300
tree7258fdc1a9489c0130b82d54d80f9ad1ce5f24b8
parent643be3bab19a6305e776721854b293928bf2bfaa
parentcb7cdd5053ab37e3b606eb313e8b482a2047091a
resolved conflicts for merge of cb7cdd50 to klp-modular-dev-plus-aosp

Change-Id: I2fc48fb4bd779042fc9bc00e6c8aca876d4a5f0b
tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java