| commit | 2357d72ce2427c7b91f8c23487f0d49590e78ea6 | [log] [tgz] |
|---|---|---|
| author | ztenghui <ztenghui@google.com> | Mon Jun 16 10:39:33 2014 -0700 |
| committer | ztenghui <ztenghui@google.com> | Mon Jun 16 10:39:33 2014 -0700 |
| tree | e80a70d0e887cc97f7900653e473ff85c673146b | |
| parent | 1dc55c3f81fe6394296c2e38124b8710e79cb0a0 [diff] | |
| parent | ecae1ffd7719a60e471550436f885299d27de7df [diff] |
resolved conflicts for merge of ecae1ffd to master Change-Id: I1ba660ce832e3360fa136be6aa0415645bfda328