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