| commit | aa46d590ea5ff6dbe5411a7ab96ac9cdd3dd2396 | [log] [tgz] |
|---|---|---|
| author | Tim Murray <timmurray@google.com> | Wed Nov 18 16:21:39 2015 -0800 |
| committer | Tim Murray <timmurray@google.com> | Wed Nov 18 16:21:39 2015 -0800 |
| tree | 01701fa29a8025f366dddc51a92fad2400d77778 | |
| parent | ea7731ad386e9e76e20c5070b14abfb3024ebb3a [diff] | |
| parent | 6eee56ccabd89adb56edf45db587ef4db7c68722 [diff] |
resolve merge conflicts of 6eee56ccab to mnc-dr2-dev. Change-Id: I74e31430cc655e4c75d290c5fada94784b4e2cd7