| commit | 22e7148b2cf78943b052ecb43096d1a38ff88c5a | [log] [tgz] |
|---|---|---|
| author | Tim Murray <timmurray@google.com> | Fri Dec 18 10:55:00 2015 -0800 |
| committer | Tim Murray <timmurray@google.com> | Fri Dec 18 10:55:00 2015 -0800 |
| tree | d1adbc820bb039c17ce424cdd722a533f3fa8651 | |
| parent | 2acdd3b416fbef74662604222c702d4962338567 [diff] | |
| parent | ad4fdc6d7c45ee22c17ea61dee0e76cae0ff319e [diff] |
resolve merge conflicts of 14b307fa47 to mnc-dr2-dev. Change-Id: I82f17b717b509553389185e6bc9886c105fcd59d