| commit | f1f0a409c6b2df0c69a40df5554654a0015b2096 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Mon Jun 15 16:36:21 2015 -0700 |
| committer | Kenny Root <kroot@google.com> | Mon Jun 15 16:36:21 2015 -0700 |
| tree | 628396a74d34d7b719b81d76410e7801111b6d40 | |
| parent | b658cb43ec69b22d030445139cbfa88249f6121e [diff] | |
| parent | 6d66cf824e4695a07996cb1256e3d3fd06fc2c36 [diff] |
resolved conflicts for merge of 6d66cf82 to mnc-dev-plus-aosp