tree f3e493daa18566597f49fb00132aa4624608cca6
parent fb594d8e4f24f9c845d49ed72ed15e92df46130b
parent 838c441e610906889ac9ac932235782810c1043d
author David 'Digit' Turner <digit@google.com> 1401265108 +0200
committer David 'Digit' Turner <digit@google.com> 1401265108 +0200

resolve merge conflicts of 838c441 to master.

Change-Id: Ia3861aabaa7acd2201da1d70664342a63711e316