OSDN Git Service

Merge commit '289306f103b181378d5d58850cf61495facc3204' into HEAD
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 22 Nov 2013 18:35:34 +0000 (10:35 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 22 Nov 2013 18:35:34 +0000 (10:35 -0800)

Trivial merge