| commit | 7a4d2a6be7cbfa8a85e2953ca79339a79d646826 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Thu Aug 04 09:46:09 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 04 09:46:09 2011 -0700 |
| tree | dda23262c8fedd883abb187f369fea84b746c67d | |
| parent | 37100faf99414e49d615f979fa033d457c273afa [diff] | |
| parent | d5f8e3b3d77d0ad24815fb86ddf9eb8eee0f29e1 [diff] |
Merge "Resolve merge conflict for '75f1fdec':"