Merge m-c to b2g-inbound.

This commit is contained in:
Ryan VanderMeulen 2013-11-20 13:38:43 -05:00
commit 41a7a0c608

View File

@ -18,6 +18,4 @@
# Modifying this file will now automatically clobber the buildbot machines \o/
#
Bug 934646 needs a clobber -- the icon resources previously copied
into $OBJDIR/mobile/android/base/res will conflict with those in
$BRANDING_DIRECTORY/res.
Bug 934646 backout needs a clobber