OSDN Git Service

Merge branch 'jb-mr1-dev' of https://googleplex-android.googlesource.com/a/platform...
authorStephen Hines <srhines@google.com>
Fri, 14 Sep 2012 02:06:52 +0000 (19:06 -0700)
committerStephen Hines <srhines@google.com>
Fri, 14 Sep 2012 02:06:52 +0000 (19:06 -0700)

Trivial merge