| commit | 48aed9fc24daeac2deca4cd2bd3ce8cf8bfc0d9c | [log] [tgz] |
|---|---|---|
| author | android-build SharedAccount <android-build@google.com> | Mon May 17 09:16:05 2010 -0700 |
| committer | android-build SharedAccount <android-build@google.com> | Mon May 17 09:16:34 2010 -0700 |
| tree | 424394fec9ccbcb548957d2868cbe793f7944a07 | |
| parent | f7df7a88230c525e2973ca5603f54a77fe47445d [diff] | |
| parent | ff55fbfa8cf30fe8a72e1a68420cd744ce957828 [diff] |
Merge commit 'ff55fbfa8cf30fe8a72e1a68420cd744ce957' with -s ours. Original merge was done manually. Change-Id: I4d5a02b052e356b26d04204dc7e96730d0990720