am 4279b2a4: am 18a5e88c: am 7e4414f2: am 65d4f7a6: Merge changes Id0595c4b,Ia1a3e8c3 into mnc-dev

* commit '4279b2a486dba9719b96c81000f4717adf302cfc':
  Revert "Replace infinite loop with foreach."
  Update intellij project for tools-common sources.

tools/layoutlib/bridge/bridge.iml

@@ -46,7 +46,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="file://$ANDROID_SRC$/tools/base/common/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../../../../../prebuilts/misc/common/tools-common/tools-common-prebuilt-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>

tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java

@@ -94,8 +94,14 @@ public class AsmGenerator {
         ListIterator<Class<?>> iter = injectedClasses.listIterator();
         while (iter.hasNext()) {
             Class<?> clazz = iter.next();
-            for (Class<?> aClass : clazz.getDeclaredClasses()) {
-                iter.add(aClass);
+            try {
+                int i = 1;
+                while(i < 100) {
+                    iter.add(Class.forName(clazz.getName() + "$" + i));
+                    i++;
+                }
+            } catch (ClassNotFoundException ignored) {
+                // Expected.
             }
         }
         mInjectClasses = injectedClasses.toArray(new Class<?>[0]);