OSDN Git Service

Merge commit '1ee45c2d2d816ee912624d81ff1b0aaa98e8fa74' into HEAD
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Dec 2013 20:38:18 +0000 (12:38 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Dec 2013 20:38:18 +0000 (12:38 -0800)

Trivial merge