OSDN Git Service

Merge "Appease the simians" into jb-dev
authorAdam Powell <adamp@google.com>
Tue, 15 May 2012 21:54:00 +0000 (14:54 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 15 May 2012 21:54:00 +0000 (14:54 -0700)

Trivial merge