| commit | 6efc674b2abb7a162eb6223c521896568b2a7a1c | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Jul 15 15:18:39 2014 -0700 |
| committer | Ying Wang <wangying@google.com> | Tue Jul 15 15:19:23 2014 -0700 |
| tree | ae70157df806d8d9edaabfff09fbce9ee63964e5 | |
| parent | 8bca5b6dc01529bf83c1f4446672eff78d4ae2e0 [diff] | |
| parent | d3b55e75c752f024a6b7b8377e377b90965e5732 [diff] |
resolved conflicts for merge of d3b55e75 to master Change-Id: Id261f6510780d1b41e165e8f56d438003ae89699