commit | a2ba8569636972e0633625c47f5a60d3a11ad834 | [log] [tgz] |
---|---|---|
author | Vladimir Chtchetkine <vchtchetkine@google.com> | Wed Nov 23 15:16:08 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 23 15:16:08 2011 -0800 |
tree | 118ecce673888a74fea014638d80eb2650331837 | |
parent | e70a1d7725a7f83c9aa823278b2532e95d3c22b8 [diff] | |
parent | c03537267d9da2124cdbf68d896bacf88d94cca9 [diff] |
am c0353726: Merge "Cherry-picked from 6f00e7fc in master. Do not merge." into ics-mr1 * commit 'c03537267d9da2124cdbf68d896bacf88d94cca9': Cherry-picked from 6f00e7fc in master. Do not merge.