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

Trivial merge