Merge commit '504c5d9c6e05cecabcb2404a2fd1a05259602858' into HEAD
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 22 Nov 2013 18:35:28 +0000 (10:35 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 22 Nov 2013 18:35:28 +0000 (10:35 -0800)

Trivial merge