| commit | f7b41d72728f6f211ab43095eb1106d19eeb9b28 | [log] [tgz] |
|---|---|---|
| author | Daniel Rosenberg <drosen@google.com> | Tue Jul 14 12:47:36 2015 -0700 |
| committer | Daniel Rosenberg <drosen@google.com> | Tue Jul 14 13:12:48 2015 -0700 |
| tree | 11e6d5f88a6cc2eda5d06d736656fae0b08e078f | |
| parent | b481395fd25a4fbe0c05d1e72418f9084749f243 [diff] | |
| parent | ee2e4b83e88a3845a5e66b079b9fbb6f718616d6 [diff] |
resolved conflicts for merge of 074ee014 to mnc-dr-dev-plus-aosp Change-Id: I346583851035950350433136599f73ab2bedba4b