| commit | f5ed55c37ec41d92e27c1ed17b9cee28bee3dec7 | [log] [tgz] |
|---|---|---|
| author | Siva Velusamy <vsiva@google.com> | Mon Sep 14 12:19:57 2015 -0700 |
| committer | Siva Velusamy <vsiva@google.com> | Mon Sep 14 12:19:57 2015 -0700 |
| tree | 40a9107f2cb2680460a68926bea79a91cf8321f4 | |
| parent | c2835b26eb128feba7e8cfc04baefc85a7e373fd [diff] | |
| parent | 3ad4e29ac2f16084dcbe3cbcee7223e2607c049c [diff] |
resolved conflicts for 3ad4e29a to mnc-dr-dev-plus-aosp Change-Id: I03b93e109f0f6e6c0ded6bd7d6ebf0964f2d26ac