tree 375da085a3b6c07491c0e5b4b2cec9347bcd5b7c
parent c3563eb9e75e0b9ae130ec22d5c6c6b1561d783b
parent bcf2adeb10c41becec3baa2bcb8de9212272399a
author Dianne Hackborn <hackbod@android.com> 1295816253 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295816253 -0800

am bcf2adeb: Merge "aapt: Allow raw "%" in unformatted string-arrays"

* commit 'bcf2adeb10c41becec3baa2bcb8de9212272399a':
  aapt: Allow raw "%" in unformatted string-arrays