| commit | 8857b943ccea433447b63e7e5422798d1e040647 | [log] [tgz] |
|---|---|---|
| author | Tingting Wang <tingtingw@google.com> | Mon Aug 29 13:53:41 2016 -0700 |
| committer | Tingting Wang <tingtingw@google.com> | Mon Aug 29 14:03:51 2016 -0700 |
| tree | 2169b3ae3a5d5c64afe3c2de3cf940e4d5a9d7f6 | |
| parent | 88a9f246fec065dfa0c25a7d321232b465d889b0 [diff] | |
| parent | 2fc12b16d143f5c45b17820d67aae0456189da3d [diff] |
resolve merge conflicts of 2fc12b1 to master Change-Id: I7fdcd4be8e858861f37d8a5bdc1d88b407e329c2