| commit | 24f8a8507852fce16334ac34cf1fd7b03752382b | [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 | bbc8c1418ad13bc3fade1747213d7fda24113367 | |
| parent | 011c440b9d359bfc1e3d24f8e0445aaa4045cfe1 [diff] | |
| parent | 6f4a52a3f7c6bd87e7109d741441bff332a445a4 [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