| commit | a3dbe51f428f9202a00935cdb708987f3058da60 | [log] [tgz] |
|---|---|---|
| author | Christopher Wiley <wiley@google.com> | Wed Aug 05 10:18:16 2015 -0700 |
| committer | Christopher Wiley <wiley@google.com> | Wed Aug 05 10:18:16 2015 -0700 |
| tree | 48b6822f45f9ad18391559ad2a0a901c686fa345 | |
| parent | 15a45a6ea7060ee28d49d43e1fbd36782b370e13 [diff] | |
| parent | 7d1be4004725dff2043928268f2ad7d8db23633c [diff] |
resolved conflicts for merge of 7d1be400 to mnc-dev-plus-aosp Change-Id: Ifc2b669bc573f059f35085d11693ea3d2cac11ec