| commit | e708954c8ce858a143684111eeca84f435775fa5 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Sun Oct 09 14:26:37 2016 -0700 |
| committer | Tao Bao <tbao@google.com> | Sun Oct 09 14:30:46 2016 -0700 |
| tree | 4537c974d005a76263f067516c18ba8cb93d4cbb | |
| parent | 713ad360c41ff82ab471fd713f1dccfe16c5605b [diff] | |
| parent | 09ab9a68387bb17b998c42cf1e45dfeab7f70fa3 [diff] |
resolve merge conflicts of 09ab9a6 to nyc-mr1-dev-plus-aosp Change-Id: Ifc0b085d8384f373ffffc14abd907227961efdf9