tree 2a71b58b60c3ea96d1e3f34eb5ad77ce28d69895
parent c3a7688651789c53bc468dade39604a386ac364f
parent 71c1d3d8645f9310d9ad93bf5eca12984b831bff
author Xavier Ducrohet <xav@android.com> 1323993097 -0800
committer Xavier Ducrohet <xav@android.com> 1323993129 -0800

Merge commit '71c1d3d8' into MR1 using -s ours

Change-Id: I392ab7665f40f9c273f8d0f837597f1bd6c9d135