| commit | 55b8a474c3bbb67bfd8a495409254337f3d1d59c | [log] [tgz] |
|---|---|---|
| author | Tom Marlin <tomm@bsquare.com> | Tue Jun 14 14:33:38 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 14 14:33:38 2011 -0700 |
| tree | 653f73841aefb3c70019e1717af5a0c6087adf6d | |
| parent | 8af9ac15bf2b8d063b3c6842769352daec3442cd [diff] | |
| parent | 0ec5485484e0667fb48bee32197b2c2e0669adf4 [diff] |
am 0ec54854: am 774abe7b: Cherry-pick 49f1857d from master. do not merge. * commit '0ec5485484e0667fb48bee32197b2c2e0669adf4': Cherry-pick 49f1857d from master. do not merge.