| commit | e9cf477488794b0c9dfb0eb18694c9dd33737c4d | [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 | c22e31435d8ae6a2bcfec44733297ea4dc1141e5 [diff] | |
| parent | 14b307fa47b46b4b424b90e6a9a0fd88b1ecc975 [diff] |
resolve merge conflicts of 14b307fa47 to mnc-dr2-dev. Change-Id: I82f17b717b509553389185e6bc9886c105fcd59d