tree f08d30ca074de4d1247bef04b806e6f14420b674
parent 747eb00eef784f7df746e61e7e714e4e422eb6d1
parent 2a36a778d384403cd92b1016ed5c860d3f2c3521
author Hung-ying Tyan <tyanh@google.com> 1285647464 +0800
committer Hung-ying Tyan <tyanh@google.com> 1285647464 +0800

resolved conflicts for merge of 2a36a778 to master

Change-Id: Ia70adeef06afddd29c827405fb5657bf9f5a29a3