| commit | c894e099d31d2a84fad10a544fb12523a80e122a | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Feb 26 10:34:33 2015 -0800 |
| committer | Ying Wang <wangying@google.com> | Thu Feb 26 10:34:33 2015 -0800 |
| tree | bcf4016348787c935e996579077be32a31950790 | |
| parent | 7a9e38840536b291688f4e3a0989acaa56af3191 [diff] | |
| parent | 641e283f5ea28d69ae5697a4a23bb2ec288a9ebf [diff] |
resolved conflicts for merge of 641e283f to master Change-Id: I9c5d9dd9f0f8c9206112f4c2f773ed81c9c2f06f