am 2dc79df2: Merge commit \'de9b6a49620d14c09bc95a1b80e9c5496cf4029b\' into HEAD
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 6 Dec 2013 01:25:48 +0000 (17:25 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Dec 2013 01:25:48 +0000 (17:25 -0800)
* commit '2dc79df2f22e7fa57599a39e7a17b25f92dbdf91':


Trivial merge