am e83cfe69: Merge commit \'504c5d9c6e05cecabcb2404a2fd1a05259602858\' into HEAD
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 23 Nov 2013 01:40:44 +0000 (17:40 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 23 Nov 2013 01:40:44 +0000 (17:40 -0800)
* commit 'e83cfe6980e7d8796bbe60ca46bad4342297ab99':


Trivial merge