| commit | c74d338c13b2538ad30dabd0b30fb3197834c883 | [log] [tgz] |
|---|---|---|
| author | Calin Juravle <calin@google.com> | Thu Jan 07 12:15:36 2016 +0000 |
| committer | Calin Juravle <calin@google.com> | Thu Jan 07 12:15:36 2016 +0000 |
| tree | 3722ad55bee09f7d03156be9aa7933f85c83c35d | |
| parent | 888da80d33b1a8e92cfab352f9ce9366a6de0783 [diff] | |
| parent | 435ad029a346b090deccaae47b2932398b7425df [diff] |
resolve merge conflicts of 435ad029a3 to master. Change-Id: I87202d69a772c593b691de8ce2faeaac9b7d1f58