| commit | 17180e9fcd49c96a2d4c03eca4b6668991219e65 | [log] [tgz] |
|---|---|---|
| author | Miao Wang <miaowang@google.com> | Mon Jul 27 17:31:57 2015 -0700 |
| committer | Miao Wang <miaowang@google.com> | Mon Jul 27 17:31:57 2015 -0700 |
| tree | 8aa0fca8a31de7cb0b09ca6810d20534fc44659b | |
| parent | c4cb6e1b4ed62feec494f449ec76c29a6f3f540f [diff] | |
| parent | 9267631bae87a62f03338958c6f6c3dcb9af3884 [diff] |
resolved conflicts for merge of 9267631b to mnc-dev-plus-aosp Change-Id: Iae8f3dfdbb5f5f7c4fdc94effc4ffad1f66d9404