| commit | 7f04f8f2dc687f89046c6a1d03e6b1d30380344b | [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 | ed26f94008bec686bae11b1ad4b8766d811baf4c [diff] | |
| parent | 08f009169646534ffb9b88edb547e5510a0a9215 [diff] |
resolved conflicts for merge of cda81d01 to mnc-dr-dev-plus-aosp Change-Id: I747b279bc49f9f82b8f8859c49b3fc2a4e3b4977