| commit | 5e4324b5aa979ca420b12c24a3dd1b1ea8aff66f | [log] [tgz] |
|---|---|---|
| author | Romain Guy <romainguy@android.com> | Thu Feb 18 11:02:21 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 18 11:02:21 2010 -0800 |
| tree | 80dfecc782b2a9b5e3dfdec96703ffc8a1b6b9bd | |
| parent | 38be92f064de148ac40c0573c28bc17e123d77f7 [diff] | |
| parent | 2feec33de8d3735a14aee4a4ce1a214bbc329e21 [diff] |
am 6f4a52a3: (-s ours) am 67e9e9df: Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE Merge commit '6f4a52a3f7c6bd87e7109d741441bff332a445a4' * commit '6f4a52a3f7c6bd87e7109d741441bff332a445a4': Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE