| commit | 5f05f83075857c499a83f36e347c1ef49501a0dd | [log] [tgz] |
|---|---|---|
| author | Tom Marlin <tomm@bsquare.com> | Tue Jun 14 15:22:28 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 14 15:22:28 2011 -0700 |
| tree | 9eda347bcd901179cb11acee92b672785d426fc5 | |
| parent | 823e96e27e6d621a794bd9c5c9ab8aa798d7c981 [diff] | |
| parent | 55b8a474c3bbb67bfd8a495409254337f3d1d59c [diff] |
am 55b8a474: (-s ours) am 0ec54854: am 774abe7b: Cherry-pick 49f1857d from master. do not merge. * commit '55b8a474c3bbb67bfd8a495409254337f3d1d59c': Cherry-pick 49f1857d from master. do not merge.