| commit | e23a6af2d0e4169807850dbd7a1b192d147926dd | [log] [tgz] |
|---|---|---|
| author | Yu Shan Emily Lau <yslau@google.com> | Wed Nov 09 21:18:58 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 09 21:18:58 2011 +0000 |
| tree | 08193aa986593696ba1e45c657bfde3b0fe31135 | |
| parent | 25e3c216f2f163c5c7c7923110e2c9cfd76a8d67 [diff] | |
| parent | 6c11c19ba152a23cad8ae272c9b7b8e97c175c85 [diff] |
am 6c11c19b: (-s ours) am 6b415b7d: Merge "do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch" into ics-mr0 * commit '6c11c19ba152a23cad8ae272c9b7b8e97c175c85': do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch