| commit | ff35904d2659b2a5baff3d72b6ab28cf6bbb7dbd | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Wed May 13 18:41:26 2015 -0700 |
| committer | Christopher Ferris <cferris@google.com> | Wed May 13 18:41:26 2015 -0700 |
| tree | f92237fe298089f3112bb1b9f5b7dd037690747e | |
| parent | 6828f8f39b7baf4968d0984fc4bf3157c86223c5 [diff] | |
| parent | e3687d64a636f20f460cf497707715b87e798673 [diff] |
resolved conflicts for merge of 428fad97 to mnc-dev-plus-aosp Change-Id: I4f84f751a9d885552d5e59fbfc8aa75bd934768d