| commit | 67457c0e868fb6c383b3f729b46b5bd6588093ff | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Mon Aug 03 10:47:13 2015 -0700 |
| committer | Mark Salyzyn <salyzyn@google.com> | Mon Aug 03 10:47:13 2015 -0700 |
| tree | 36f7ff1545ca066aaa607eb109bd762e541362ca | |
| parent | 0303872548e88e2caf7272bf26a9aa974077c1b4 [diff] | |
| parent | eb7718b1d2f0f0a9a735b41d15c24761f5e4cfc9 [diff] |
resolved conflicts for merge of eb7718b1 to mnc-dr-dev-plus-aosp Change-Id: I28e749b040fc97e36f73d11c0f2e8ca487d5b158