tree d84ae47d7a6c89511c151028df3094e01e8c67c0
parent fc1bf9256372018188468b8ba5163ac5dcc74f56
parent 4754c79a77dc09259dee7e018710a96fe167bb8e
author Xavier Ducrohet <xav@android.com> 1302567101 -0700
committer Xavier Ducrohet <xav@android.com> 1302567101 -0700

resolved conflicts for merge of 4754c79a to honeycomb-plus-aosp

Change-Id: I3e7bd605e08be0c45533d4c9193727bbf413d342