tree 4fe802bc60245b8fe57fce35bb055375681f16b8
parent 5d16cd046298ec9e009cfdd2056c64c1a9ac5ba3
parent 40336782eaa797bca3d1487784af113ba3b143ff
author Daisuke Miyakawa <dmiyakawa@google.com> 1246636704 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1246636704 -0700

am 40336782: Add tests. internal bug id 1868702.

Merge commit '40336782eaa797bca3d1487784af113ba3b143ff'

* commit '40336782eaa797bca3d1487784af113ba3b143ff':
  Add tests. internal bug id 1868702.