tree 0d91cba9d1c188d1898289f6b21826c6f6d316d3
parent 2592184c976ef83aa9fdad7d63bfdb408c95aa7d
parent 6571ed31d9c967faacd552be238b41088ae11e25
author Lajos Molnar <lajos@google.com> 1418325471 -0800
committer Lajos Molnar <lajos@google.com> 1418325471 -0800

resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aosp

Change-Id: Ibaea3a0766f75a61964615482a9ef28651a42b37