am c853be7b: Disambiguate framework formats from exynos formats
authorRebecca Schultz Zavin <rebecca@android.com>
Thu, 23 Aug 2012 19:55:06 +0000 (12:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Aug 2012 19:55:06 +0000 (12:55 -0700)
* commit 'c853be7b9977a6a0402bd5a65c0c32ac9e2fde1d':
  Disambiguate framework formats from exynos formats


Trivial merge