| commit | 03eb766a562598636a0e7c717da0cefdd5f2b329 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Tue Nov 15 22:14:14 2016 -0800 |
| committer | Tao Bao <tbao@google.com> | Tue Nov 15 22:14:14 2016 -0800 |
| tree | 71f60c4680c6764b6adce56579f4d3ce1dbb6506 | |
| parent | 1f0af0c2ea952a37fc4052cddf6f1dec85f87723 [diff] | |
| parent | d5d34d70a5d9c24e214855bb7e1e5402a96ec7cc [diff] |
resolve merge conflicts of d5d34d7 to stage-aosp-master Change-Id: I2871dafbd293dbbbb538da84fa857dd8972e2eb8