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


Trivial merge