tree 6a4c58d2ef03512140a80c713e648dd66cbb0704
parent 69c2dcbb0f2672652366e3950dea48ed4483eaa4
parent 774abe7b7e463436107545250aa573c99e246a86
author Tom Marlin <tomm@bsquare.com> 1308086937 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308086937 -0700

am 774abe7b: Cherry-pick 49f1857d from master. do not merge.

* commit '774abe7b7e463436107545250aa573c99e246a86':
  Cherry-pick 49f1857d from master. do not merge.