tree 2eda89e8e3e1c72cf73920a4eaaddcda7ade3a30
parent 171af247589f63fffee37a0e81a975afb62279a2
parent a976bddd9cfff0be5703484009ea875dee5d2456
author Ying Wang <wangying@google.com> 1365574902 -0700
committer Ying Wang <wangying@google.com> 1365574902 -0700

resolved conflicts for merge of a976bddd to master

Change-Id: I64e1cbfb0eee891ce4d1eee40eefdcedcc501f7f