| commit | c2837c2f34071bf9f11a3cf7b2499817efad2e61 | [log] [tgz] |
|---|---|---|
| author | Yu Shan Emily Lau <yslau@google.com> | Wed Nov 09 21:50:48 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 09 21:50:48 2011 +0000 |
| tree | 08193aa986593696ba1e45c657bfde3b0fe31135 | |
| parent | e23a6af2d0e4169807850dbd7a1b192d147926dd [diff] | |
| parent | c7b60925d7ef7f6825bbb338f476198669a2b5c4 [diff] |
am c7b60925: (-s ours) am 1baa142c: do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch * commit 'c7b60925d7ef7f6825bbb338f476198669a2b5c4': do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch