OSDN Git Service

Merge from AOSP
authorJean-Baptiste Queru <jbq@google.com>
Thu, 17 Nov 2011 23:59:53 +0000 (15:59 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 18 Nov 2011 00:00:20 +0000 (16:00 -0800)
commit4ef5e2e5376043e433e01b61d219dd2444719893
tree46579df9ee21822193624692c2ab94d44ccb2e5b
parentfb410365ca67d36d4c81d7826712c6a05437612f
parentc72c5311c167736e186e51934e4d9d8e25fd599f
Merge from AOSP

Change-Id: I41161514ae072b40bf4c94a9392007de1e9db937