| commit | c64f11ef648dbe4d4730704ec338ddfb8e297ca1 | [log] [tgz] |
|---|---|---|
| author | Jin Qian <jinqian@google.com> | Fri Nov 18 15:55:51 2016 -0800 |
| committer | Jin Qian <jinqian@google.com> | Fri Nov 18 15:55:51 2016 -0800 |
| tree | 812150693c952c742684e7a4362b9b82f2ee1354 | |
| parent | f2cb1f00da1ce6f5503ce3c2f7191f0d545606df [diff] | |
| parent | 456df4099f552ef692fd50c6cc7af7e99eaffcda [diff] |
resolve merge conflicts of 456df40 to nyc-mr2-dev-plus-aosp Change-Id: I968f88ea425fb69a0395451fa290f1947e185859