| commit | 0ec5485484e0667fb48bee32197b2c2e0669adf4 | [log] [tgz] |
|---|---|---|
| author | Tom Marlin <tomm@bsquare.com> | Tue Jun 14 14:28:57 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 14 14:28:57 2011 -0700 |
| tree | 6a4c58d2ef03512140a80c713e648dd66cbb0704 | |
| parent | 69c2dcbb0f2672652366e3950dea48ed4483eaa4 [diff] | |
| parent | 774abe7b7e463436107545250aa573c99e246a86 [diff] |
am 774abe7b: Cherry-pick 49f1857d from master. do not merge. * commit '774abe7b7e463436107545250aa573c99e246a86': Cherry-pick 49f1857d from master. do not merge.