| commit | 5b151dbe4c9dc7812bb4faaa115a254f8dd7667f | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Thu Jun 30 17:54:12 2016 -0700 |
| committer | Roshan Pius <rpius@google.com> | Thu Jun 30 19:17:33 2016 -0700 |
| tree | 245392856ebeffb0602ad75bfc6745649918d1ae | |
| parent | e5ad912ecfb9c6183dd68c00dd9f1d70d7e28f8c [diff] | |
| parent | 2619fd50a4c6817f7635df9bdf807dab480139d6 [diff] |
resolve merge conflicts of 2619fd5 to master Change-Id: Idd8dd35ab210e6b6cf3f25bd0d58e8d9b7ac9da5