OSDN Git Service

am 7361b741: am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add...
authorSuchi Amalapurapu <asuchitra@google.com>
Tue, 18 May 2010 21:55:48 +0000 (14:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 May 2010 21:55:48 +0000 (14:55 -0700)
Merge commit '7361b7410f2427022cc8917b00553dc26107cded' into kraken

* commit '7361b7410f2427022cc8917b00553dc26107cded':
  Uncomment a test that was marked as STOPSHIP


Trivial merge