| commit | 25c19e6fd44af4164148a4f1b5831b24af05a025 | [log] [tgz] |
|---|---|---|
| author | Christopher Wiley <wiley@google.com> | Fri Jul 24 13:00:12 2015 -0700 |
| committer | Christopher Wiley <wiley@google.com> | Fri Jul 24 13:00:12 2015 -0700 |
| tree | cd4c31a386b355c3351fc6a9b6bc68d1c14c0e89 | |
| parent | 1e6be7df74bc39d489390be3a51d3611815862d7 [diff] | |
| parent | 62789539e00b74aec5c28d491da1a478ea431917 [diff] |
resolved conflicts for merge of 62789539 to mnc-dev-plus-aosp Change-Id: Ib8c51e77ec5a1de16dacbf374d934ddf5c734bdf