OSDN Git Service

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

Trivial merge