| commit | c96aef2283fb7c091c8b35071ab82d3f330c025d | [log] [tgz] |
|---|---|---|
| author | Jatin Matani <jatinm@google.com> | Fri Jul 10 23:24:27 2015 -0700 |
| committer | Jatin Matani <jatinm@google.com> | Sat Jul 11 00:01:30 2015 -0700 |
| tree | 22d2104175f6afc9c308a86a114066a1f0363964 | |
| parent | 5fd77e2ce94e555b06665f9ab636674669c6c6a9 [diff] | |
| parent | d711426a87ed131c527beb8f7a9160daa14d1f94 [diff] |
resolved conflicts for merge of d711426a to mnc-dev-plus-aosp Change-Id: I3d92549eb41e4f28d141bb1c218e56a8075edb1f