OSDN Git Service

Reconcile with ics-factoryrom-release
authorJean-Baptiste Queru <jbq@google.com>
Tue, 20 Sep 2011 14:38:26 +0000 (07:38 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 20 Sep 2011 14:38:26 +0000 (07:38 -0700)
Change-Id: I9223944a4645008cefa5b73e4a551f73a84aba3f


Trivial merge