| commit | 2feec33de8d3735a14aee4a4ce1a214bbc329e21 | [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 | f4d901d22f470e7d421cde73033da6a191f7db17 | |
| parent | 71f13a1cc83f51f2e95ae83de90df033a9a6ec00 [diff] | |
| parent | 0814cdd0c7e40ea95ad536eca8bdd36b39d40495 [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