OSDN Git Service

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

Trivial merge