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)
commite5a9bc4aa309d0989b2663a8f49d0b2661bcf81f
tree06a7b5fc61d07b7b9466c9527dab0cefee43a8e6
parent84a0fc9c00d5fa6facbd26eac7da00c58cea87a9
parent2dc79df2f22e7fa57599a39e7a17b25f92dbdf91
am 2dc79df2: Merge commit \'de9b6a49620d14c09bc95a1b80e9c5496cf4029b\' into HEAD

* commit '2dc79df2f22e7fa57599a39e7a17b25f92dbdf91':