| commit | 3bae94d78ed4c078552df9817a1952129a725189 | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Tue Dec 09 15:38:38 2014 -0800 |
| committer | John Reck <jreck@google.com> | Tue Dec 09 15:38:38 2014 -0800 |
| tree | 1bea1dc942af9e6633c10fc36342574669377d98 | |
| parent | 28089cc39b0247d5e854a1a44cd8af17464b9e36 [diff] | |
| parent | fe11126d23f7456b4ea1dffce30dac45173f63f0 [diff] |
resolved conflicts for merge of fe11126d to lmp-mr1-dev-plus-aosp Change-Id: I60bf82ff71d9af0d80e7da8856efb4641c85885b