OSDN Git Service

Merge from master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 May 2013 19:13:02 +0000 (12:13 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 May 2013 19:13:02 +0000 (12:13 -0700)

Trivial merge