| commit | 4c9e57f156d3cbd86b38e9897dfdab81964efe90 | [log] [tgz] |
|---|---|---|
| author | Jae Seo <jaeseo@google.com> | Tue Jun 03 10:03:46 2014 -0700 |
| committer | Jae Seo <jaeseo@google.com> | Tue Jun 03 17:06:58 2014 +0000 |
| tree | 55cb749043c9dd147d3bdacb981f935cc0e2fe62 | |
| parent | 5e9a42588e986a7a2ab12de5d70adff5f2db9c5a [diff] | |
| parent | 3c784d6359f15a5451b670a18384e9ae3c9aa276 [diff] |
resolved conflicts for merge of ebe661c4 to master Change-Id: Ic25dc762ee43654b439de3ec237ead007bee3df4