am e5a9bc4a: am 2dc79df2: Merge commit \'de9b6a49620d14c09bc95a1b80e9c5496cf4029b...
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 6 Dec 2013 01:38:45 +0000 (01:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Dec 2013 01:38:45 +0000 (01:38 +0000)
commitc456c0789a057b9c6381429b57bb66ee6b52cfff
treeeaff7d37ba3032d6462fa461c4a03f7828481db1
parent3a749a4de5e03f68c2ceb63e0cc681763ae81aa4
parente5a9bc4aa309d0989b2663a8f49d0b2661bcf81f
am e5a9bc4a: am 2dc79df2: Merge commit \'de9b6a49620d14c09bc95a1b80e9c5496cf4029b\' into HEAD

* commit 'e5a9bc4aa309d0989b2663a8f49d0b2661bcf81f':