tree e2bc03827fb038577a534405a5b6c12528e52bba
parent 7b8b9bff7868e9e1dae0c261714152d21a76863f
parent 59cdbf00103f3255399216ddbe49fb50fbdcaa53
author Ken Wakasa <kwakasa@google.com> 1409129833 +0900
committer Ken Wakasa <kwakasa@google.com> 1409129833 +0900

resolved conflicts for merge of 59cdbf00 to master

Change-Id: I991ff097b7d1e82b1e833d9cf03e0910a8398306