| commit | 11d05de2d8aa62095243b499a805d682bdca234c | [log] [tgz] |
|---|---|---|
| author | Vasu Nori <vnori@google.com> | Wed Sep 22 10:18:39 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 22 10:18:39 2010 -0700 |
| tree | f92fd8706fefdc57e45eb5eae96380d8ee41afc5 | |
| parent | aa0186f7ef984e194897fa8561a30c2b26353eeb [diff] | |
| parent | e031d557f242b28f456969f6833e3b366e818079 [diff] |
am 18f196a1: (-s ours) am 9e1266da: Merge "(do not merge)hide videochat changes in gingerbread. bug:3001483" into gingerbread Merge commit '18f196a19eb93c8b309c8a3e2093ce4400708348' * commit '18f196a19eb93c8b309c8a3e2093ce4400708348': (do not merge)hide videochat changes in gingerbread. bug:3001483