| commit | 6eb1a3e8c68fdbb9522679dabdc75168eb2c6e55 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Tue Dec 22 13:02:39 2015 -0800 |
| committer | Mark Salyzyn <salyzyn@google.com> | Mon Dec 28 11:20:24 2015 -0800 |
| tree | 6ebf1a68c97f28a7531ee43edfed42bb8763fdcf | |
| parent | c127d656b50b6dfd20548abde175840947b639f6 [diff] |
resolve merge conflicts of 94ab88228e to master. Bug: 26178938 Change-Id: I1ec3421f4bb501942a0c06032d56cdaf06f56b45