| commit | bdf319d1d22908e1751a448f16492254344b7c0a | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Jun 03 12:12:00 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed Jun 03 12:12:00 2015 -0700 |
| tree | 9fbd8300ad6378aba54b58b55921f78c5d1a1578 | |
| parent | 33bf11bd20a46966381e957609fae19dde473b0d [diff] | |
| parent | 64f1f021d506c3fb641cc0d0fc432e5ee425df5f [diff] |
resolved conflicts for merge of de28adf3 to mnc-dev-plus-aosp Change-Id: I69f80ee5cba90b1516a35171a38d40cc79d07c19