| commit | f53bfc911fa88c15b25f38553a5647ad00f221a3 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Thu Jul 21 19:14:36 2016 -0700 |
| committer | Chih-Hung Hsieh <chh@google.com> | Thu Jul 21 19:14:36 2016 -0700 |
| tree | 78c8438100aad9012251dcfd6ea50d2785e5423d | |
| parent | 1f38231b7fca008766fdc135b90172fd2b983315 [diff] | |
| parent | 3fb651b0b73c462d96df063e19cc3cfefa249262 [diff] |
resolve merge conflicts of 3fb651b to nyc-mr1-dev-plus-aosp Change-Id: I52d56e84620c85638798d949f8eb819387a01902