| commit | ad2e343d2a1d8aed03f32deb3b9d0b91cb018938 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed May 06 15:05:01 2015 +0100 |
| committer | Narayan Kamath <narayan@google.com> | Wed May 06 15:05:01 2015 +0100 |
| tree | 059348b62b3b92ae257f1775fdbde5d4ea3a833c | |
| parent | 7fb2ef721bc19e442e2da2bbdf75cafd6009b81c [diff] | |
| parent | 98dcefd36a6751ec2b6b7d846e4d009a880b9746 [diff] |
resolved conflicts for merge of 98dcefd3 to mnc-dev-plus-aosp Change-Id: I82723ffaa2511be14ea4671907cacb8d7b153510