From: Eric Fischer <enf@google.com>
Date: Thu, 23 Sep 2010 20:52:00 +0000 (-0700)
Subject: am 9c708358: am 37cedce1: Merge "Add an aapt option to allow string variations for... 
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/19d44c3efab1f054eefda13f888e2b9cdc536c86?ds=inline;hp=--cc

am 9c708358: am 37cedce1: Merge "Add an aapt option to allow string variations for different devices." into gingerbread

Merge commit '9c70835896b6c078ac4c8b2e30cb6cfba70bb9d7'

* commit '9c70835896b6c078ac4c8b2e30cb6cfba70bb9d7':
  Add an aapt option to allow string variations for different devices.
---

19d44c3efab1f054eefda13f888e2b9cdc536c86