OSDN Git Service

Merge "Merge commit '830ad08'"
authorMike Lockwood <lockwood@google.com>
Tue, 3 Apr 2012 19:12:45 +0000 (12:12 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 3 Apr 2012 19:12:45 +0000 (12:12 -0700)
commitf0f1955c17a355ee2af419d6cf0c0968bc2ba297
treeef4580fe15d124218d1ed982e912219571791c11
parent595e8a5fbc0a0b014742da74850b0fd9653778a7
parent3e29718d34eba7c6c455fa6bb622856fe651876e
Merge "Merge commit '830ad08'"