tree 61d5ab60b689f7703443df754e8b13569a47b5c0
parent f6b2beaabda6607b1c60dccaff038e9b59733821
parent 0a4b3fd93b2de21de0684a8291663920d9099170
author Irfan Sheriff <isheriff@google.com> 1296685390 -0800
committer Irfan Sheriff <isheriff@google.com> 1296685390 -0800

resolved conflicts for merge of 0a4b3fd9 to gingerbread-plus-aosp

Change-Id: I294e6e843ae028377d19c1180e0d5e9aef52897c