| commit | 0f1f20f6c3443ffd9d15ebbe9c8f8083a59377d0 | [log] [tgz] |
|---|---|---|
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | Tue Oct 18 13:55:55 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 18 13:55:55 2011 -0700 |
| tree | 7af431d4de25fad86c8641dfb78190a3909a58a2 | |
| parent | 7661353ddd155cbc795e5a6d324a5f34ae705f75 [diff] | |
| parent | d4803d835198cc71514bfd93aa5e7602e6b0c0ba [diff] |
am d4803d83: (-s ours) Merge "Cherry picked from c9a94b0f in master. Do not merge." into ics-mr0 * commit 'd4803d835198cc71514bfd93aa5e7602e6b0c0ba': Cherry picked from c9a94b0f in master. Do not merge.