| commit | 323c08bdebf6b61275ee26465d7802370e49184e | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 30 16:32:10 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Jul 30 16:32:10 2015 -0700 |
| tree | fcb03dfc3cc1543584b7637c15b2307acffe0210 | |
| parent | 449889ac37e6fc7786f3eb627eba5da109b85174 [diff] | |
| parent | 76f00a1e991bd31e40d4941a4142f5f3939f0a75 [diff] |
resolved conflicts for merge of 486645ee to mnc-dr-dev-plus-aosp Change-Id: Ia7fbfc56f01b683e4e4870b3952fe2af32962123