OSDN Git Service

resolved conflicts for merge of 5974d730 to lmp-dev-plus-aosp
authorMathieu Chartier <mathieuc@google.com>
Sat, 30 Aug 2014 18:34:52 +0000 (11:34 -0700)
committerMathieu Chartier <mathieuc@google.com>
Sat, 30 Aug 2014 18:34:52 +0000 (11:34 -0700)
Change-Id: I415996d240a32c2ab7b66e25c824b42c908094dd


Trivial merge