| commit | c7b60925d7ef7f6825bbb338f476198669a2b5c4 | [log] [tgz] |
|---|---|---|
| author | Yu Shan Emily Lau <yslau@google.com> | Wed Nov 09 14:36:12 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 09 14:36:12 2011 +0000 |
| tree | 641527a23fe0a50a2170881d400294600ae923ab | |
| parent | 6c11c19ba152a23cad8ae272c9b7b8e97c175c85 [diff] | |
| parent | 1baa142c06f3500f02dfc8d2fc15f5f70b77f3b0 [diff] |
am 1baa142c: do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch * commit '1baa142c06f3500f02dfc8d2fc15f5f70b77f3b0': do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch