| commit | c7b0435cc709c328da8e2b515ea04c8bc40d1094 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Jul 15 14:33:10 2015 -0700 |
| committer | Jim Miller <jaggies@google.com> | Wed Jul 15 14:33:10 2015 -0700 |
| tree | 042daa8ffa664abb32492f27ba95a27a3f70aea8 | |
| parent | 2fc3216e2f8b77116594ca5cda2e927c43094039 [diff] | |
| parent | 1d4247c4cc89c6d62e44ed3115f26579979b44b5 [diff] |
resolved conflicts for merge of 1d4247c4 to mnc-dr-dev Change-Id: I057c529dcd5d48e0dcf256a9d096c5d8b815892a