OSDN Git Service

Merge "Manual merge of Idf6bb25438336616e6453e7afe0e79f227af98d3" into kraken
authorJim Miller <jaggies@google.com>
Fri, 16 Apr 2010 00:47:01 +0000 (17:47 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 16 Apr 2010 00:47:01 +0000 (17:47 -0700)
commite6a66462e474eda38fb8035fe1dbff6fbc95e989
treec5a922a844ec13a0a5c16c639ae0c309be17e8cd
parenta54fb4f4c08cf6e5cd8dc0c45b4b0e5875e8ffed
parent01974f88fa20b12bfa91c0455ce73278c08cea64
Merge "Manual merge of Idf6bb25438336616e6453e7afe0e79f227af98d3" into kraken