commit | cbb960ca7ccf450a743a315068cf60ccd95fecca | [log] [tgz] |
---|---|---|
author | Ying Wang <wangying@google.com> | Tue Jun 15 16:06:49 2010 -0700 |
committer | Ying Wang <wangying@google.com> | Tue Jun 15 16:06:49 2010 -0700 |
tree | aec0ab31fd2c6fe57af4e0f16ec56a386daf8356 | |
parent | 823b6f3516076b92f78c3fc27037d24bb514e653 [diff] |
Merge 2 changes from master. Change-Id: I20384bb557ec24bf55cdad0e633f4a814791e5e7