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)
Change-Id: I11aeba06aa988e97d12125028327ed46fe2bc9c7


Trivial merge