OSDN Git Service

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

Trivial merge