| commit | 772153b3c7fad7a1147290843d3d45f672ffa825 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Tue Sep 27 13:29:47 2016 -0700 |
| committer | Tao Bao <tbao@google.com> | Tue Sep 27 13:30:43 2016 -0700 |
| tree | eaf3c24d159db426643b15e99ff8a5569f444198 | |
| parent | 4b17a18f11de797eb04b122b929e672390433eac [diff] | |
| parent | 64b92dfb5d67cb0641524ad2988767c97e2029ce [diff] |
resolve merge conflicts of 64b92df to nyc-mr1-dev-plus-aosp Change-Id: I1b076d3f9b82380c74e66fe95ee8e8cf5b6eebf7