| commit | e1477b39704dc7c022a44371d0cb9d9061780bf8 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Thu Oct 30 17:22:17 2014 -0700 |
| committer | Ian Rogers <irogers@google.com> | Thu Oct 30 17:22:17 2014 -0700 |
| tree | b8566973a667dbff9d461aa42fc439e3a3d345e1 | |
| parent | cb859cdfa107ab81bd695c57230c4064b9ac39ab [diff] | |
| parent | 62a09752e6187e820d51c684ca8baf733289444d [diff] |
resolved conflicts for merge of 62a09752 to lmp-mr1-dev-plus-aosp Change-Id: Icfe0e7a29c2155b3b26b7068114098e0d30beaff