OSDN Git Service

Merge "Merge commit 'bc52ca2'"
authorMike Lockwood <lockwood@google.com>
Tue, 3 Apr 2012 19:12:58 +0000 (12:12 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 3 Apr 2012 19:12:58 +0000 (12:12 -0700)
commit62b21c69ca9e297bdedc3eaa88e88d5479120b1a
tree4d7cc3988e86ba316be32ec0b38fbdbe036c3e77
parentf0f1955c17a355ee2af419d6cf0c0968bc2ba297
parent69ccdbd78a6dbcf32d6f734d238e5eaaa606a85f
Merge "Merge commit 'bc52ca2'"