| commit | 9f4da54754f3d684c733e32824a7039cb6ee18b9 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Mon Sep 21 14:25:34 2015 -0700 |
| committer | Tom Cherry <tomcherry@google.com> | Mon Sep 21 14:25:34 2015 -0700 |
| tree | 7a7f03f6b56aa2c8482d87ca2aeac5f87e73df88 | |
| parent | 8fd795927166c5c01233ac32b8d7d418e27651ba [diff] | |
| parent | 764d7bff7ebb6d91c94b6d148bcbbdf64900a187 [diff] |
resolved conflicts for 5caca3dd to mnc-dr-dev-plus-aosp Change-Id: I773e514a8232b77cdd566dc36c9efc4e15f206f0