| commit | 474c60cc38fb754076ff17812fd29049002a1980 | [log] [tgz] |
|---|---|---|
| author | John Wang <johnwang@google.com> | Thu Jun 09 11:56:28 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 09 11:56:28 2011 -0700 |
| tree | c8c0374f32a2f32425bd530840094070deb0e364 | |
| parent | 9429e6ebe427e1bde01391d53f323ec33d540a14 [diff] | |
| parent | 1861225be3c848fdf395f7aa815c673af4239011 [diff] |
am 1861225b: (-s ours) am fe682fd7: am cea03df2: Do not merge. Return null id for Non-phone device. * commit '1861225be3c848fdf395f7aa815c673af4239011': Do not merge. Return null id for Non-phone device.