| commit | 7e68d3e36b1317dc1acf517d6bb2cf761c20f68b | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Fri Aug 12 13:33:02 2016 -0700 |
| committer | Chih-Hung Hsieh <chh@google.com> | Fri Aug 12 13:33:02 2016 -0700 |
| tree | f9b8e5009ceb2005ae31ac841debdd0c4cbdbee0 | |
| parent | c34027ec3d0e1d845c3469ed07044e8e622d9cda [diff] | |
| parent | 84717d4118cff0790aecd8365029200e36a47bba [diff] |
resolve merge conflicts of 84717d4 to master Change-Id: I74381544f1157572a212460462e73fd82c12168d