| commit | ec5e3aae6d8c89a5f6ca0a34fcdfc72e9a611188 | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Tue Aug 11 18:27:02 2015 -0700 |
| committer | Dan Willemsen <dwillemsen@google.com> | Tue Aug 11 18:27:02 2015 -0700 |
| tree | b0d0bdae2e81a8dc38eccf16b7bbfdd77927e4f9 | |
| parent | a3b91e621c4ca1708fa2572e05e8ac5b0f4b5d17 [diff] | |
| parent | b184ec2a82e26b80fb1bdb45c4d3ecc903480e36 [diff] |
resolved conflicts for merge of b184ec2a to mnc-dr-dev-plus-aosp Change-Id: I90ac0f467ff13a038f27581cb2d07b1c5af5bd92