tree e462225087708364e09801d3a02895998bfeba66
parent e83af902c4ed1f0f1afb1b4f6f26a8003aca4954
parent 845fdba7b5a7b89571f2c85bd542c75650054544
author Gloria Wang <gwang@google.com> 1312495994 -0700
committer Gloria Wang <gwang@google.com> 1312495994 -0700

resolved conflicts for merge of 845fdba7 to master

Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce