| commit | 9de20d4a7ce848cec2644da6e1fa7c50b9f07830 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Wed Aug 17 23:25:01 2016 -0700 |
| committer | Tao Bao <tbao@google.com> | Wed Aug 17 23:25:01 2016 -0700 |
| tree | 1e8903709d97935081b5a66e5eea096efa20f765 | |
| parent | cc34bf13ef35ada1779233040d8ca4c68c09d5ec [diff] | |
| parent | 7f8dc846a3cd697d28dd9a50d802dd72f320ebf5 [diff] |
resolve merge conflicts of 7f8dc84 to nyc-mr1-dev-plus-aosp Change-Id: I56d8af5552758dae44c1030c684448e621d226c5