| commit | cfda5bb47ac558d3628074904e386178c3fc58e1 | [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 | 559349e7b1e0ba86865c9486dc71badbc67eeccc [diff] | |
| parent | 074ee014b55e81339fe63ba5e8e005cdc047f063 [diff] |
resolved conflicts for merge of 074ee014 to mnc-dr-dev-plus-aosp Change-Id: I346583851035950350433136599f73ab2bedba4b