| commit | de682eec6ab3bdde75eda26437312e7b2c0774bb | [log] [tgz] |
|---|---|---|
| author | Jinhui Wang <jinhuiw@google.com> | Fri Mar 17 15:41:55 2017 -0700 |
| committer | Jinhui Wang <jinhuiw@google.com> | Fri Mar 17 15:43:11 2017 -0700 |
| tree | b4499bb798727f1f5635629e157eeba86c32fd39 | |
| parent | 8199196b7d7890304a7f5d0a77d188373c02b8af [diff] | |
| parent | f6e07df16b9528711b7ba24155b92e04b004874b [diff] |
resolve merge conflicts of f6e07df1 to master Test: built DocumentsUI manually Change-Id: Ie2570b72f0d5e34d024ebc0d59e43f660deea356