tree edb48bc69001ca3ef96bf072d71441bc8a60d547
parent bf3122eed31cd24acdf5cfd25541db0beb77e6f0
parent 3041096d137144d9d1ebdd6df88ebe8e85133c05
author Gloria Wang <gwang@google.com> 1288809544 -0700
committer Gloria Wang <gwang@google.com> 1288809544 -0700

resolved conflicts for merge of a8d7b747 to master

Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349