tree 4e8a5e1b0d6c7c25286cb0a8736a2e61602731b0
parent c1df1ddc3b92f8efb1f4eaa230ac5bc419c19620
parent 50963b1aa5c2828b46a4e0acf7626b8aef83ef68
author Daisuke Miyakawa <dmiyakawa@google.com> 1258499288 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258499288 -0800

am 50963b1a: am 8c808187: Modify test code a little.

Merge commit '50963b1aa5c2828b46a4e0acf7626b8aef83ef68'

* commit '50963b1aa5c2828b46a4e0acf7626b8aef83ef68':
  Modify test code a little.