| commit | b6b81f5f39f5ff5b8530717b4c015ef31d43e5d4 | [log] [tgz] |
|---|---|---|
| author | Shimeng (Simon) Wang <swang@google.com> | Mon Sep 13 14:43:16 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 13 14:43:16 2010 -0700 |
| tree | 7b9e8d58de7225250c6374b51591237067b6d7bc | |
| parent | e931c68f53ffca710270f26a21387e482a88e1e3 [diff] | |
| parent | 4de4f09e8ed95255c1077cfbbaf018877221455d [diff] |
am 4de4f09e: (-s ours) am fbd26467: Merge "DO NOT MERGE" into gingerbread Merge commit '4de4f09e8ed95255c1077cfbbaf018877221455d' * commit '4de4f09e8ed95255c1077cfbbaf018877221455d': DO NOT MERGE