tree c04df3586d492dc4df78a34b4601cedc84d840e5
parent 29c6c01bd609a53a06ae8d5a167e1d35fa04ed26
parent 75e326486763e9b0a764a837cae38719b79cb329
author Jean-Baptiste Queru <jbq@google.com> 1267802594 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1267802594 -0800

Merge from eclair

Change-Id: I4496dadd8a738a05c647589ca78732e9b608ca29