| commit | b84e351733e380a3759951ca6042c69b6dc584ad | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Mon Jan 24 14:33:28 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 24 14:33:28 2011 -0800 |
| tree | d29e34a7c10bc251d0f801947d3d3c477a77cfeb | |
| parent | 0ccac6e3ee687930d411be69b3bb6904656d128d [diff] | |
| parent | 5b9936f651a06b4b3c988ee330d12355041eeb00 [diff] |
am 5b9936f6: Merge "LayoutLib: Use special view cookie for include-merge case." into honeycomb * commit '5b9936f651a06b4b3c988ee330d12355041eeb00': LayoutLib: Use special view cookie for include-merge case.