Merge branch 'master' of github.com:zoodles/robolectric
FragmentTransation needs to commit after showing dialog
Merge branch 'master' of github.com:zoodles/robolectric
Replaced slashes with file.separator in order to pass the test also on Windows.
Unfortunately I cannot test it on Linux.

Signed-off-by: Diego Costantini <diego.costantini@gmail.com>
Added a condition to build.xml to find maven in windows (and Linux - to be tested).
On windows, find sdk location by looking into ${env.ANDROID_HOME} since find-android.bat does not work.
Merge branch 'master' of git://github.com/pivotal/robolectric into robo-staging
Merge branch 'robolectric-2/load-res-in-base-cl' into robolectric-2-master

* robolectric-2/load-res-in-base-cl:
  Extract XmlFileBuilder.
  Move RobolectricPackageManager to org.robolectric.builder.
  Rename and move RoboLayoutInflater to org.robolectric.res.builder.LayoutBuilder.
  Rename and move TestAttributeSet to org.robolectric.shadows.RoboAttributeSet.
  Move ResName and Attribute to org.robolectric.res.
  The org.robolectric.res.builder package is for android-referencing resource builders. Move DrawableBuilder to there. Extract PreferenceBuilder.
Merge pull request #412 from zoodles/master

Pull request from Zoodles team - useful for those who are still on Robolectric 1.x
Merge pull request #410 from cowst/bug/separators

Replaced slashes with file.separator in order to pass a test on Windows
Use File join rather than string appends for Windows FS compat.
Merge pull request #411 from cowst/bug/fix-build-for-windows

build.xml fixes for windows
Fixed RobolectricWiringTest and added a warning about updating it when Maven updates its version of the Android Support Library.
[maven-release-plugin] prepare release robolectric-1.2
[maven-release-plugin] prepare for next development iteration
Use ASM for bytecode instrumentation.
Fix instrumentation of static methods.
More ASMification.
Get it working with Javassist again.
Working on getting javassist working again.
Filter StrictMode and CloseGuard references from instrumented code.
Get more tests working.