| commit | af20a7cb12e5426738f8f068f6e5e46871bae1aa | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Tue Sep 01 15:05:34 2015 -0700 |
| committer | Tom Cherry <tomcherry@google.com> | Tue Sep 01 15:30:56 2015 -0700 |
| tree | c5f02fff8bdebc9028c2f8bab6acfd2491664899 | |
| parent | 9597c6266b95561636d3b3c2f24b15f522d45545 [diff] | |
| parent | cda81d01c6d8df84c67e5a2391356bb8407921dc [diff] |
resolved conflicts for merge of cda81d01 to mnc-dr-dev-plus-aosp Change-Id: I747b279bc49f9f82b8f8859c49b3fc2a4e3b4977