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)
Change-Id: I0258f55e8199c06948878ba0e9bf7941bf60a435


Trivial merge