| commit | 6828f8f39b7baf4968d0984fc4bf3157c86223c5 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Wed May 13 17:59:20 2015 -0700 |
| committer | Christopher Ferris <cferris@google.com> | Wed May 13 17:59:20 2015 -0700 |
| tree | f92237fe298089f3112bb1b9f5b7dd037690747e | |
| parent | 83b410d60c894aaa1e17546c2f35e78d9f4e5c7e [diff] | |
| parent | 206c65418e0415e7023cb51761e87e5fc34053b7 [diff] |
resolved conflicts for merge of cd206b39 to mnc-dev-plus-aosp Change-Id: Ief3271524b1e8f1950fc202eaa3e8c1bf248f41b