tree f0fcc75e1cefcc8abd4e53052938460fd22fde9a
parent dbbba1ad1f268d71d88b3540f7eeac0d314f9424
parent 9c7281fbb21d3552c1f5540ecbf4d66dbb63cbee
author Xavier Ducrohet <xav@android.com> 1386211284 -0800
committer Xavier Ducrohet <xav@android.com> 1386211284 -0800

resolved conflicts for merge of 9c7281fb to master

Change-Id: Ibbcb5cdc46d6d7e1a5bf12d090717f11b26b7308