| commit | 1c59fc4f56c095800e692b6e5317709766ac97be | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Dec 15 15:58:43 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 15 15:58:43 2011 -0800 |
| tree | f7ec3b4deaee6850504a39655683440468023b29 | |
| parent | 2cbdc6a76891165a775f19e61f00e84e4b26115e [diff] | |
| parent | 5192264cf4b2742443bd66d4d320a63f7a39f3bc [diff] |
am 5192264c: (-s ours) am dc6a269f: Merge commit \'71c1d3d8\' into MR1 using -s ours * commit '5192264cf4b2742443bd66d4d320a63f7a39f3bc': Move platform component to rev3. do not merge.