OSDN Git Service

Merge commit 'a18b9d1e1a014290691d63a7f335085dadc83e46' into HEAD
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 23 Nov 2013 00:48:36 +0000 (16:48 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 23 Nov 2013 00:48:36 +0000 (16:48 -0800)

Trivial merge