OSDN Git Service

Merge from AOSP
authorJean-Baptiste Queru <jbq@google.com>
Mon, 27 Aug 2012 23:33:55 +0000 (16:33 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 27 Aug 2012 23:34:00 +0000 (16:34 -0700)
commit2f4c73d9995158522bd18db125232838afd099e8
tree35e74b454d0d23403a4f42889ac72168bbf3a086
parent2ee9fcd1c0b883413f3e4d274882d864a552720b
parent1dfffe03c8db552e94280d6968418024b26da350
Merge from AOSP

Change-Id: I11aeba06aa988e97d12125028327ed46fe2bc9c7