| commit | 9cf990beec6ef42c09c39e49d3e5991e96a9608b | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Mon Aug 17 20:50:48 2015 -0700 |
| committer | Dan Willemsen <dwillemsen@google.com> | Mon Aug 17 20:50:48 2015 -0700 |
| tree | 98e9478862cb98f10622940bc12e1fa5146bf23e | |
| parent | f4ff2b119c1e5980cf002bfb260915b1366d879a [diff] | |
| parent | 05fae7e0be51ab3bc54cd62e1db9160d31bb89ea [diff] |
resolved conflicts for merge of 05fae7e0 to mnc-dev-plus-aosp Change-Id: I9f0f1169839afabc7ec7e439b668798e2cd111a3