OSDN Git Service

resolved conflicts for merge of a42d23a7 to lmp-dev-plus-aosp
authorMathieu Chartier <mathieuc@google.com>
Wed, 27 Aug 2014 21:31:30 +0000 (14:31 -0700)
committerMathieu Chartier <mathieuc@google.com>
Wed, 27 Aug 2014 21:31:30 +0000 (14:31 -0700)
commit0d9abcd1a08fb76159e90ac86e28879016d51d9e
treecdfc535f2c11d724f245b06bf300f7c91d0323e1
parentb86fd83c6e6d206b9fe92717167c7d05163891f7
parenta42d23a740c1752d0e27827716606a2e53839c4f
resolved conflicts for merge of a42d23a7 to lmp-dev-plus-aosp

Change-Id: I0258f55e8199c06948878ba0e9bf7941bf60a435