| commit | 0471881a88f5dbcdd0d97297759f07b8653d79a4 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Sep 02 20:15:48 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed Sep 02 20:15:48 2015 -0700 |
| tree | 6a87183f2a1f4eddbf67e530cb319267f329eaf5 | |
| parent | a4be123bafeb811f8d2edb8a6e49f578269882d2 [diff] | |
| parent | 22633f5b9605bbd7d61709b40c4592739c0ed707 [diff] |
resolved conflicts for merge of 7af48652 to mnc-dr-dev-plus-aosp Change-Id: Icde642757a1335da49d2f884de33b368888ae709