tree d065c3de7f54b800d94139f06d0898f63d4ed297
parent 4f4870f0bb7009e6d974b5d2c371924214684735
parent 8064dd2265b53a1d2e36ebefb44adea44687cfe0
author Gilles Debunne <debunne@google.com> 1285872652 -0700
committer Gilles Debunne <debunne@google.com> 1285872652 -0700

resolved conflicts for merge of 8064dd22 to master

Change-Id: Iff7f729d1e375902a8d89bb237694913380b0d36