| commit | d673b70dfd2506882c04335e29714e0d2c4ed5cd | [log] [tgz] |
|---|---|---|
| author | Yu Shan Emily Lau <yslau@google.com> | Wed Nov 09 16:41:13 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 09 16:41:13 2011 +0000 |
| tree | 641527a23fe0a50a2170881d400294600ae923ab | |
| parent | 1baa142c06f3500f02dfc8d2fc15f5f70b77f3b0 [diff] | |
| parent | 6b415b7d0530151ffa3221594102a6752a539692 [diff] |
am 6b415b7d: (-s ours) Merge "do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch" into ics-mr0 * commit '6b415b7d0530151ffa3221594102a6752a539692': do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch