diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-05-13 09:40:35 -0700 |
|---|---|---|
| committer | Deepanshu Gupta <deepanshu@google.com> | 2014-05-13 09:40:35 -0700 |
| commit | a5461ebfaebf3337a0cf1c752334f23de145a6d1 (patch) | |
| tree | 782c3d3179416b3ef5f3743b2e07477dcd402220 /tools/layoutlib/create | |
| parent | 9053261a5413f401168d25fa4a9749723b232949 (diff) | |
| parent | 6d3c4ab2456a30c5517f4ad6fb8df8d64c517beb (diff) | |
| download | frameworks_base-a5461ebfaebf3337a0cf1c752334f23de145a6d1.zip frameworks_base-a5461ebfaebf3337a0cf1c752334f23de145a6d1.tar.gz frameworks_base-a5461ebfaebf3337a0cf1c752334f23de145a6d1.tar.bz2 | |
resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev
Change-Id: I5c4634897882deb663f32d8148202d7c9189521d
Diffstat (limited to 'tools/layoutlib/create')
| -rw-r--r-- | tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java index 11433aa..964e2f3 100644 --- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java +++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java @@ -113,6 +113,7 @@ public class Main { "android.pim.*", // for datepicker "android.os.*", // for android.os.Handler "android.database.ContentObserver", // for Digital clock + "com.android.internal.view.menu.ActionMenu", }, excludeClasses); aa.analyze(); |