am 84a0fc9c: am e83cfe69: Merge commit \'504c5d9c6e05cecabcb2404a2fd1a05259602858...
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 23 Nov 2013 03:31:24 +0000 (19:31 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 23 Nov 2013 03:31:24 +0000 (19:31 -0800)
commit3a749a4de5e03f68c2ceb63e0cc681763ae81aa4
treeeaff7d37ba3032d6462fa461c4a03f7828481db1
parentf6cd695569049d5621a54ffaf62409681101f339
parent84a0fc9c00d5fa6facbd26eac7da00c58cea87a9
am 84a0fc9c: am e83cfe69: Merge commit \'504c5d9c6e05cecabcb2404a2fd1a05259602858\' into HEAD

* commit '84a0fc9c00d5fa6facbd26eac7da00c58cea87a9':