| commit | 22bc242a5b3ecc3efc88d82f99d96a7eb05996fa | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Fri Aug 21 15:09:30 2015 -0700 |
| committer | Tom Cherry <tomcherry@google.com> | Fri Aug 21 15:09:30 2015 -0700 |
| tree | 206f9684a98d74159d52878bd68d24e8af8d45c2 | |
| parent | 25c22bb9e71998d0358628052fc32a09ec53bbbf [diff] | |
| parent | b21de5f627f3d2f06000f9b61ad17228cb09b385 [diff] |
resolved conflicts for merge of b21de5f6 to mnc-dr-dev-plus-aosp Change-Id: I13fd71d5af0b0a66d0c3e2f026581c60e9b95e8b