| commit | 4d26681f3d7d2a3ae8e2ab326d9d2d11b55d7297 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Jan 22 11:53:00 2015 -0800 |
| committer | Ying Wang <wangying@google.com> | Thu Jan 22 11:54:58 2015 -0800 |
| tree | 8950d63e77a510360edac8530c09daaf82c8df71 | |
| parent | 833b427d72c91c1d1b7f8ac99fb87a6742eb6f43 [diff] | |
| parent | 0f205ad959005514d5fad98ba14a1b3db84e173e [diff] |
resolved conflicts for merge of 0f205ad9 to master Change-Id: Ic741805a0037d8d29d7d5ff6e2b6e83067943f12