OSDN Git Service

resolved conflicts for merge of 1604e186 to lmp-dev-plus-aosp
authorSreeram Ramachandran <sreeram@google.com>
Wed, 23 Jul 2014 00:08:02 +0000 (17:08 -0700)
committerSreeram Ramachandran <sreeram@google.com>
Wed, 23 Jul 2014 00:08:02 +0000 (17:08 -0700)
Change-Id: Ia37af0e92adc8c119ce170e072f4cd3899927bf6


Trivial merge