| commit | 723ec00af46d1f95d69fe5af53e0a5d09f01a7d6 | [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 | ef596c117b8f11f8025770c52baeac04b2e4551a | |
| parent | 310f8da0c3122ed5419db8f12a6e98d3188325b2 [diff] | |
| parent | 39afd5f7daaa525adaf38caf4a48d2cb22e0a41d [diff] |
Merge commit 'goog/master' into merge_master Conflicts: include/ui/Rect.h libs/ui/ISurfaceComposer.cpp