commit | 204e57c43824413d6e15fdf05c490ed4d869d44e | [log] [tgz] |
---|---|---|
author | Mathieu Chartier <mathieuc@google.com> | Thu Jul 24 11:27:04 2014 -0700 |
committer | Mathieu Chartier <mathieuc@google.com> | Thu Jul 24 11:27:46 2014 -0700 |
tree | 3fb49abf8e6eed4e8fd888b5233437015cc72292 | |
parent | 797517aa6226f5f34ea70d0963e703ce888b5726 [diff] | |
parent | 7521704fef0c0ce302f3c36749cb6c830cb6b569 [diff] |
resolved conflicts for merge of 7521704f to lmp-dev-plus-aosp Change-Id: Id4fe1e4c222c79a9b743e267ddca407976295248