tree 4236447a8b41fb64ec1e52b71209c6fab5c47e2d
parent 9dbcbe08751bacbf1fcbf6037fed1e6c69a27fa3
parent 246808bedfb35ce8abd6cee434ff5b07a6618e8a
author Xavier Ducrohet <xav@android.com> 1337103869 -0700
committer Xavier Ducrohet <xav@android.com> 1337103869 -0700

resolved conflicts for merge of 246808be to jb-dev-plus-aosp

Change-Id: I3415e2d7b4e8295b7415951c0e8a78c775574089