OSDN Git Service

Merge "Fix the system"
authorRomain Guy <romainguy@google.com>
Wed, 8 Feb 2012 02:22:43 +0000 (18:22 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 8 Feb 2012 02:22:43 +0000 (18:22 -0800)

Trivial merge