am 54c8c3d9: (-s ours) am b3c780f1: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.

Browse Source

* commit '54c8c3d920ee863716638483602a011943da6484':
  Move the automatic namespace outside of the res namespace. do not merge.

...

This commit is contained in:

Xavier Ducrohet 2012-02-23 18:47:08 -08:00 committed by Android Git Automerger

parent 5c8dd44fbc 85492ed98e

commit 7434d28600

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available