tree 34e1f48b675b38ce0b40b1a3514e8c5ba0f22452
parent 9447af12e290f2f5aaba38df9e5181274ef4d9c3
parent 86bb22584fd306faedc1b3fb7abd08c59f356417
author Irfan Sheriff <isheriff@google.com> 1345757826 -0700
committer Irfan Sheriff <isheriff@google.com> 1345757826 -0700

resolved conflicts for merge of 86bb2258 to jb-dev-plus-aosp

Change-Id: I5f115310948a03d791c201fb605dfbb576c0576e