OSDN Git Service

resolved conflicts for merge of b82b2f98 to klp-dev-plus-aosp
authorNarayan Kamath <narayan@google.com>
Tue, 28 Jan 2014 19:47:58 +0000 (19:47 +0000)
committerNarayan Kamath <narayan@google.com>
Tue, 28 Jan 2014 19:47:58 +0000 (19:47 +0000)
commit8773d51eae2a40d95adfe517476e9098eec14166
treea41c2c1ffb088320a1169d286116bbc254c7f373
parentbe674bf688fec9ce4ec04e77c93644be8253d273
parentb82b2f985143d2e799ec4a9557f1e50208589279
resolved conflicts for merge of b82b2f98 to klp-dev-plus-aosp

Change-Id: Ia110056e5fdd2387c207748b17c5c17d1a18ac5b
tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java
tools/layoutlib/bridge/src/android/graphics/NinePatch_Delegate.java
tools/layoutlib/bridge/src/android/graphics/Path_Delegate.java