OSDN Git Service

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

Trivial merge