am 1704a5cc: (-s ours) am f31297ed: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.

* commit '1704a5cc59c501fab53dbd2e754a8479ac1f57ca':
This commit is contained in:
Xavier Ducrohet
2012-02-23 18:49:51 -08:00
committed by Android Git Automerger

Diff Content Not Available