| commit | 0b4a2fb7ce6961e27a3cf082297277a53ef2d524 | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Wed May 27 14:34:50 2009 -0700 |
| committer | Mathias Agopian <mathias@google.com> | Wed May 27 14:34:50 2009 -0700 |
| tree | 9f07ac96b798cb21cd1edc5ac60db2d360d856d8 | |
| parent | 794aaef95e1afa06b68a93c9fe9c881cf438c76a [diff] | |
| parent | 489d60ec36c3927c9ee0bc14a44c1c77b74c09f6 [diff] |
Merge commit 'goog/master' into merge_master Conflicts: include/ui/Rect.h libs/ui/ISurfaceComposer.cpp