| commit | f1e4bd2a66e2eb0d64f3fa33f3ad43569316a056 | [log] [tgz] |
|---|---|---|
| author | Xia Wang <xiaw@google.com> | Fri Jul 30 13:50:03 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 30 13:50:03 2010 -0700 |
| tree | e18988807e2a960d5df43b63c4a54e5691eff010 | |
| parent | f0ba841f74e719924dfef964254acb96b99089c5 [diff] | |
| parent | 903d445f4102f3ae15e370bd10e1745a88905a99 [diff] |
am 903d445f: (-s ours) am 131ce67d: Merge "DO NOT MERGE" into gingerbread Merge commit '903d445f4102f3ae15e370bd10e1745a88905a99' * commit '903d445f4102f3ae15e370bd10e1745a88905a99': DO NOT MERGE