| commit | 6f4a52a3f7c6bd87e7109d741441bff332a445a4 | [log] [tgz] |
|---|---|---|
| author | Romain Guy <romainguy@android.com> | Wed Feb 17 21:17:48 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 17 21:17:48 2010 -0800 |
| tree | 52f3b8c3574f03f382feff8682d1528a11cd686a | |
| parent | 6c71d476f32adb5308a2a9e32660b66b2b7e6c1a [diff] | |
| parent | 67e9e9df929aad9139f1dc776b15f6c5d64f424e [diff] |
am 67e9e9df: Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE Merge commit '67e9e9df929aad9139f1dc776b15f6c5d64f424e' into eclair-plus-aosp * commit '67e9e9df929aad9139f1dc776b15f6c5d64f424e': Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE