| commit | 95a0c7c8e63ab0a53ba1b225effe593c71b9ddb7 | [log] [tgz] |
|---|---|---|
| author | Pavel Zhamaitsiak <pavelz@google.com> | Tue Jan 12 15:43:11 2016 -0800 |
| committer | Pavel Zhamaitsiak <pavelz@google.com> | Tue Jan 12 15:43:11 2016 -0800 |
| tree | c9680d62009876b237284eb47f046857b463a054 | |
| parent | d0eb1809238b868440a46d176ee17d2c6b158114 [diff] | |
| parent | 68514d5325d726ff830df8003f9715b1987f5f98 [diff] |
resolve merge conflicts of 68514d5325 to master. Change-Id: I989230fe4a307070f7d13b53b9eea9f23a4b5e34