OSDN Git Service

Merge "Merge commit '830ad08^'"
authorMike Lockwood <lockwood@google.com>
Tue, 3 Apr 2012 19:12:35 +0000 (12:12 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 3 Apr 2012 19:12:35 +0000 (12:12 -0700)
commit595e8a5fbc0a0b014742da74850b0fd9653778a7
tree49970d4b6797b09f3dfbe6e2fdde9cc4f6be03e7
parent1663565739361f3e01308e9c4d6cf30bfc6c197d
parente75e81268291469b371f6ade5bc8927956fe5289
Merge "Merge commit '830ad08^'"