Skip to content
Commit 6caa0300 authored by Xavier Ducrohet's avatar Xavier Ducrohet Committed by Android Git Automerger
Browse files

am 1704a5cc: (-s ours) am f31297ed: am 816b873d: Move the automatic namespace... 

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

* commit '1704a5cc':
parents a12522b7 1704a5cc
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment