| commit | 03282bb97df26d17377b8a4e0fa1ee780d6a983d | [log] [tgz] |
|---|---|---|
| author | Romain Guy <romainguy@android.com> | Thu Feb 18 11:02:32 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 18 11:02:32 2010 -0800 |
| tree | 80dfecc782b2a9b5e3dfdec96703ffc8a1b6b9bd | |
| parent | 5e4324b5aa979ca420b12c24a3dd1b1ea8aff66f [diff] | |
| parent | d9e6976e609e9f5e79cf26b79524b670ac22c85b [diff] |
am ab4835ee: (-s ours) am 00b17659: Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE. Merge commit 'ab4835ee0df866a4f7982644742e2b758c50fdd7' * commit 'ab4835ee0df866a4f7982644742e2b758c50fdd7': Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.