| commit | 6caa03004df8bfc7f4718c2afecf56b0b59fa764 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Feb 23 18:49:51 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 23 18:49:51 2012 -0800 |
| tree | 958071c79627ca1be8e55fe2f45945de608717e6 | |
| parent | a12522b73dac6baf622004f77ad97ac47059c21f [diff] | |
| parent | 1704a5cc59c501fab53dbd2e754a8479ac1f57ca [diff] |
am 1704a5cc: (-s ours) am f31297ed: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge. * commit '1704a5cc59c501fab53dbd2e754a8479ac1f57ca':