| commit | 2ed28704733fae65d304fe54e483202d871a22cf | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Fri Sep 12 19:46:28 2014 -0700 |
| committer | Mathieu Chartier <mathieuc@google.com> | Fri Sep 12 19:58:41 2014 -0700 |
| tree | db2d941e47629e52a1c3369832b893e9d08d1b2d | |
| parent | da151bb3afeb9d1322e9b99a7e06be8b966fa140 [diff] | |
| parent | df4a39e8ca60e6226f6b5db9f34447847e499408 [diff] |
resolved conflicts for merge of df4a39e8 to lmp-dev-plus-aosp Change-Id: I6dc353b7e3e5a120ddf957accf235ce8f98bca25