tree e7313cbaa9859fb9d302969a21f0837fb1676529
parent ef52176f1244a5bb98d82a0c8c7f4351edec17a1
parent 8390651c124546a2600c5f830afbcc7d2edd4d8f
author Gilles Debunne <debunne@google.com> 1286305916 -0700
committer Gilles Debunne <debunne@google.com> 1286305916 -0700

resolved conflicts for merge of 8390651c to master

Change-Id: Ibaa6034dbf87473dfb7d8a324a5f91fc745b99aa