| commit | 6e9857da67d46d658e28f73500f08182a9b15b7e | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Fri Oct 10 09:07:21 2014 -0700 |
| committer | Paul Lawrence <paullawrence@google.com> | Fri Oct 10 09:07:21 2014 -0700 |
| tree | 84dccfcf3a74fad2232a0382bbc1dbbedcc889f0 | |
| parent | c638c6647d0a8e30b2e176e36b1c08ef57766f06 [diff] | |
| parent | bbb36319119edde9377fb80015235893c30d2bc9 [diff] |
resolved conflicts for merge of bbb36319 to lmp-mr1-dev-plus-aosp Change-Id: I6b62347c3acfda7c2c954e719547021009d20c01