| commit | 1242aaf17d3a5e9e9687f2c684908aa5a2adf5a9 | [log] [tgz] |
|---|---|---|
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | Wed Nov 23 15:17:32 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 23 15:17:32 2011 -0800 |
| tree | 804a143b4076b71632a0b60b336763bfbc2dbd6d | |
| parent | b52abf5c8b8f626406c5c059269c55e8b140443b [diff] | |
| parent | a2ba8569636972e0633625c47f5a60d3a11ad834 [diff] |
am a2ba8569: (-s ours) am c0353726: Merge "Cherry-picked from 6f00e7fc in master. Do not merge." into ics-mr1 * commit 'a2ba8569636972e0633625c47f5a60d3a11ad834': Cherry-picked from 6f00e7fc in master. Do not merge.