| commit | dc06011a0e9a7a32a5c51c623c76641c9ed28bc1 | [log] [tgz] |
|---|---|---|
| author | Christopher Wiley <wiley@google.com> | Fri Jul 24 10:02:17 2015 -0700 |
| committer | Christopher Wiley <wiley@google.com> | Fri Jul 24 10:02:17 2015 -0700 |
| tree | cd4c31a386b355c3351fc6a9b6bc68d1c14c0e89 | |
| parent | bf11c9dcaeee38c79ee298200d339de81a775a70 [diff] | |
| parent | 62789539e00b74aec5c28d491da1a478ea431917 [diff] |
resolved conflicts for merge of 62789539 to mnc-dr-dev-plus-aosp Change-Id: Ib57ba4362675c43950d7c87a3d64d945cde45894