| commit | 00ed831a11f1fd55414299fc5d549472d0454a19 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Tue Mar 08 21:39:13 2016 -0800 |
| committer | Tao Bao <tbao@google.com> | Tue Mar 08 21:39:13 2016 -0800 |
| tree | eaae8246c5065d9a67d1b20f362f8cc3ac775a72 | |
| parent | 8e47cb7d821d52fd85191f6bdb8c7998fbdb29f5 [diff] | |
| parent | 2ad8b9757750b55d94b73f900edef7adc1a1caf1 [diff] |
resolve merge conflicts of 2ad8b97577 to nyc-dev Change-Id: Ifa7501e58dd25e73ed760b1383a1873e4d449885