| commit | 45be42e89efef8e582c096287c9bdffe8beaf8bd | [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 | 54afdbaef79c7265395d0b84f54c96c7c9f11322 [diff] | |
| parent | 7af4865215320e6b58a33fec776b7ae4f1717f86 [diff] |
resolved conflicts for merge of 7af48652 to mnc-dr-dev-plus-aosp Change-Id: Icde642757a1335da49d2f884de33b368888ae709