| commit | bed0a1958363f384639278c0a627431cc5d3c69a | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Aug 11 16:59:48 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 11 16:59:48 2011 -0700 |
| tree | 57155194ebc76ca333510510e4ffcf201d2d4656 | |
| parent | aac78535cd9add109fe6315ae370381c3b36a533 [diff] | |
| parent | 6d38bdfc7b9ff699370b4a40dcbdddce0ea713b8 [diff] |
am 6d38bdfc: resolved conflicts for merge of a74a4811 to honeycomb-plus-aosp * commit '6d38bdfc7b9ff699370b4a40dcbdddce0ea713b8': sha module is deprecated