tree 5d5fd7c46dec0d0e760bc8c7437e0d064b04c561
parent e2c25a2307b80f7e7dc71b350ed25fc668fd6b09
parent 5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a
author Mathias Agopian <mathias@google.com> 1256856882 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256856882 -0700

am 5dc7a21c: Merge change I4e036287 into eclair

Merge commit '5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a' into eclair-plus-aosp

* commit '5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a':
  update line test to expose some bug on SGX530 ed4