| commit | 247e441b0c039046d7ab355424a3d5e41c9bab91 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Mon Aug 18 14:58:13 2014 -0700 |
| committer | Dan Albert <danalbert@google.com> | Mon Aug 18 14:58:13 2014 -0700 |
| tree | f6fe0d367c87580a9a6402fbd1ad86c448a4c0ab | |
| parent | bd4351f9452c1e095e02894c198fe4ee8a99832c [diff] | |
| parent | 6df7b609984479c894be81140730578896dbdd8f [diff] |
Resolved conflicts for merge of 6df7b609 to lmp-dev-plus-aosp. Change-Id: I204e5701031c9ba9cd783c0db58cd51d93a5dc61