| commit | c3bc0b112c86daab040c8839f9e4399d8e4f2c1a | [log] [tgz] |
|---|---|---|
| author | Ian Pedowitz <ijpedowitz@google.com> | Tue Aug 11 15:06:29 2015 -0700 |
| committer | Ian Pedowitz <ijpedowitz@google.com> | Tue Aug 11 15:06:29 2015 -0700 |
| tree | 4be262059bde4ad1e024cf734f0fdb2ebde13974 | |
| parent | f8cb77dfd2a6a0f0901bb63b02f901d216e72891 [diff] | |
| parent | e5a631585a7b07c329f9ada04c99ed04b6c16b62 [diff] |
resolved conflicts for merge of e5a63158 to mnc-dev-plus-aosp Change-Id: Ifcbf55d0f4a158602867c01546f4c0f7e668697f