| commit | 2da99bdaa1712f00525e6a84b58044332cb1baef | [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 | ed330500de06dc645769ea87372fb624390b52a8 | |
| parent | 947f4f4d384ea26eb2145cc070a3eed42c59534a [diff] | |
| parent | cc77841f643751fd9f128e90f7d1587445ef353e [diff] |
Merge commit 'goog/master' into merge_master Conflicts: include/ui/Rect.h libs/ui/ISurfaceComposer.cpp