| commit | cb297d3bd3df589c61f20cb4fbaae4c78c599e7a | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Jan 09 11:42:04 2014 -0800 |
| committer | Ying Wang <wangying@google.com> | Thu Jan 09 11:42:04 2014 -0800 |
| tree | 1c8bbd414fc3fe9bae28e8576d40672d827236d0 | |
| parent | 6a271ead2f29937c51d60d77215e49e8c8f9e1c7 [diff] |
Reconcile the merge. Change-Id: If3edaedc417e390005b83cbf649b5c1f07a2ea82