| commit | 5c4a35a9f58bd97b44e0905639b7f4f20d92cda0 | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Wed Aug 12 23:28:17 2015 -0700 |
| committer | Bart Sears <bsears@google.com> | Wed Aug 12 23:28:17 2015 -0700 |
| tree | 74b5f4fab97a085481739c9db88e45771e46545a | |
| parent | 832f243827dd4fdb44b3849f3679d00f08303e7c [diff] | |
| parent | c1fdbd41a56882f536590f99ab065a0b53864ff6 [diff] |
resolved conflicts for merge of c1fdbd41 to mnc-dr-dev-plus-aosp Change-Id: I96731df91a7f2646de26f21d3b984c3f58da3373