| commit | 9ba15b1a5ad47a69bf2b8654debddc3c27ae790c | [log] [tgz] |
|---|---|---|
| author | Sarmad Hashmi <mhashmi@google.com> | Tue Feb 09 17:39:33 2016 -0800 |
| committer | Sarmad Hashmi <mhashmi@google.com> | Tue Feb 09 17:39:33 2016 -0800 |
| tree | 99571ec2daaa4c6d254a005da6e8b775857ca94a | |
| parent | 54ec16d62d7179755c0edf22cc0fd23da042342b [diff] | |
| parent | e14ae7dd12e943e20a96798c53a7b1e0ddb18e42 [diff] |
resolve merge conflicts of e14ae7dd12 to master. Change-Id: I44128233cb86b34db3f7d2b1e4ca1aa0f6d1b518